Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Wed, 8 Apr 2015 17:30:49 +0000 (20:30 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Wed, 8 Apr 2015 17:30:49 +0000 (20:30 +0300)
commit21dc66dbe148a63d1e056e3b3c03933889392fc2
tree7755aa7a68af0d26e3d55e7108b12a0d43470753
parent9c09d2f4c27e64469843e4f5c75c2dfadf5a9479
parentf3f57928b0b8ff5e342f9417323a1592bc2ca945
Merge branch 'master' into newmc

Conflicts:
tmpl/skel.en
tmpl/skel.en
This page took 0.009989 seconds and 4 git commands to generate.