Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@uncensored.citadel.org>
Wed, 18 Jul 2012 15:24:35 +0000 (17:24 +0200)
committerthe_mgt <themgt@uncensored.citadel.org>
Wed, 18 Jul 2012 15:24:35 +0000 (17:24 +0200)
commit7974c7b863e396a87e1479525a10db9b9cf93ca9
tree6c27db5c6b76d139a139bf335a29ea5a73ad34b5
parentd4c971207fb13dd52ac1a7a6e53e531e4fbe03c2
parent8fae1a3f7a2c53606f1c7418637f141e424e5b26
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

Conflicts:
webcit/static/t/view_blog/post.html
webcit/static/t/view_blog/post.html