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)
commit24d58de71b60444a3bdb12d1cb9dbd52e84c2df6
treecbc286dee5dc9f479fede281e14474bbb6a3bd80
parentab12fa72509a565d036682d9c869d1f34ff48e35
parent77692b9778b23c9f72c3ca703c7a725adf2fd442
Merge branch 'newstyles'

Conflicts:
cloudcms/templates/cms/base.html
cloudcms/templates/cms/base.html