Merge branch 'master' into admin
commit3b3d08a1e56c42ae03d0dd683bb801c6379a48ba
authorStefan Kögl <stefan@skoegl.net>
Fri, 18 May 2012 15:04:00 +0000 (18 17:04 +0200)
committerStefan Kögl <stefan@skoegl.net>
Fri, 18 May 2012 15:04:00 +0000 (18 17:04 +0200)
tree1d4b91c2ff21d9d6bf21b1a78cef3c24b9289792
parent08bbeb030ef33e8b360ba42ac92f31613423b11c
parentc2cb3706c651e5db14b45909ae0fc25ee939852a
Merge branch 'master' into admin
mygpo/settings.py