[MERGE] merge bzr saas-4 addons branch
authorChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 15:12:01 +0000 (17:12 +0200)
committerChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 15:12:01 +0000 (17:12 +0200)
commitd93f628c725ebac3d2d4a421ef788df1114bb2fc
treed2f2eb46a7310862fc22474a5cbf01fd81ab86e2
parent8f0066d728ae90f5c33520777c42c7fb3652437d
parent40abb97136c865b30132dcaa6afff140e9b1ab9d
[MERGE] merge bzr saas-4 addons branch
addons/website_blog/controllers/main.py