Merge branch 'newstyles'
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 25 Oct 2012 12:20:27 +0000 (15:20 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 25 Oct 2012 12:20:27 +0000 (15:20 +0300)
Conflicts:
cloudcms/templates/cms/base.html

1  2 
cloudcms/templates/cms/base.html

Simple merge