Merge branch 'feature-newstyles' into release-0.13
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 9 Apr 2013 09:48:29 +0000 (12:48 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 9 Apr 2013 09:48:29 +0000 (12:48 +0300)
commit0988bfac78a5983e9dd80984390aad738807339c
tree8a69e14558086dced09d82950509b98ac48745ae
parent42c49050258ec225b52406dfbb7c034989757ec3
parenta313be91b1d7313f8a3656cbbe3fa3335e36c54b
Merge branch 'feature-newstyles' into release-0.13

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