Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Fri, 27 Mar 2015 18:10:54 +0000 (20:10 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Fri, 27 Mar 2015 18:10:54 +0000 (20:10 +0200)
commit0a8209edec6578ec0c2e6fbc1f6462b1de75b72c
tree442d90ab923b0cc295743a31362d0cf96c3eec30
parent0c0b6de0b23bd11b55f16c8b154f65ccc273c346
parent93c81af3918c6e7478f3340a97ea2f2a3f0dd253
Merge branch 'master' into newmc

Conflicts:
app.psgi
log.conf
app.psgi
log.conf
This page took 0.010207 seconds and 4 git commands to generate.