Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Wed, 25 Feb 2015 20:28:54 +0000 (22:28 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Wed, 25 Feb 2015 20:28:54 +0000 (22:28 +0200)
commitf2ea44d7760ab1a725cac836fff9e7cd5c893700
treec0232c5f94d09156eb153531041d11f33214211c
parent750b40cb7cf4c9dbf2b85c18e3d0db172441facd
parent031ffaf58cc26884316489ca7d99a867840bf957
Merge branch 'master' into newmc

Conflicts:
app.psgi
app.psgi
This page took 0.009779 seconds and 4 git commands to generate.