Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 9 Feb 2015 21:02:43 +0000 (23:02 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 9 Feb 2015 21:02:43 +0000 (23:02 +0200)
commit3e09c768b3e7c39806494d2cc6e24b845ff108f3
tree3db9519e5cc62e55ff6b32b1f8a6ab24ff33a66f
parent5c6462fde5cca1c98cf481a2ba3e3245d4030403
parentf1ca277108d24951290bd4162d2a336bd02c44fd
Merge branch 'master' into newmc

Conflicts:
tmpl/skel.en
js/90-nav.js
tmpl/skel.en
This page took 0.010501 seconds and 4 git commands to generate.