Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Fri, 6 Feb 2015 15:21:28 +0000 (17:21 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Fri, 6 Feb 2015 15:21:28 +0000 (17:21 +0200)
commit5251db546cbc5eb678a007cfee54d170ad29ff45
treea34b32e66af125d93de41140948d6496123a9deb
parenta4751308b1e71373ed51624a48468039b74959dd
parent52a7850b7a5c640391ab280394a9b1a79096db70
Merge branch 'master' into newmc

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