Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 23 Feb 2015 14:39:04 +0000 (16:39 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 23 Feb 2015 14:39:04 +0000 (16:39 +0200)
commit898dded38238e89ca0932d23a6a4d3b3759c9cbf
tree2c10dff041e0ab666fbe6f59ec69cd426b87478c
parent761d945f99b44e6beb85669c08359b25f7707034
parent6de06ca2dda95d8f209e789aad30774eccc1246b
Merge branch 'master' into newmc

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