Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 3 Mar 2015 17:07:39 +0000 (19:07 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 3 Mar 2015 17:07:39 +0000 (19:07 +0200)
commit3a85cde38e7cd33e361f6b2f1b08f9419f09253c
tree2868bcf52af3777c8f9af01b75de5892e64166d4
parent184ac15755819f6ca1c4a54182c1456521cddb24
parent581a6d30cc891dd4274c19df3ae5f9bfce52bbef
Merge branch 'master' into newmc

Conflicts:
log.conf
This page took 0.009353 seconds and 4 git commands to generate.