Merge branch 'master' into newfeatures
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 26 Mar 2012 16:27:26 +0000 (19:27 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 26 Mar 2012 16:27:26 +0000 (19:27 +0300)
commitcd063e0c024b5a3ca43e8d24056c0737bf62d42e
treeaf0712da4569eb93d780e279d6b55476b930293a
parent7fa8ecdff3430fba8463cf1175a7346618a35926
parent52abca016a4ec89760640cbe33523fcfb73a92f4
Merge branch 'master' into newfeatures
cloudcms/cms.py
cloudcms/models.py
cloudcms/templates/cms/base.html