Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 16 Mar 2015 10:05:16 +0000 (12:05 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 16 Mar 2015 10:05:16 +0000 (12:05 +0200)
commit5b01a19d266d33b2d0bfcd01ae3a924f4a742ec4
tree6bff25672e6aead35c9f5d07cf0db72671fa12a2
parent3d9a4393f81ff564d41784ca42dc47210c79984f
parent2beb67b456221a9a56d4354f0f4a5c435f0c3a73
Merge branch 'master' into newmc

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