Merge branch 'master' into view-refactor
authorzuber <marek@stepniowski.com>
Sat, 26 Sep 2009 11:30:35 +0000 (13:30 +0200)
committerzuber <marek@stepniowski.com>
Sat, 26 Sep 2009 11:30:35 +0000 (13:30 +0200)
commitdba809feb44cd1c4d155f3e3254a1cca5323f95f
tree7eed46f9e42f65429f7c271a63fbaceb3e22eba1
parent392251a9a79eb96a0fd51438c64606d70ade3395
parenta8e1fae76ff2277a387f403600fe31bef4b2387e
Merge branch 'master' into view-refactor

Conflicts:
project/static/css/master.css
project/static/css/master.css
project/static/js/editor.js