[MERGE] Rebase incorrect top-level merge of `pad/wiki` refactoring + extra merge...
authorOlivier Dony <odo@openerp.com>
Wed, 29 Aug 2012 15:54:00 +0000 (17:54 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 29 Aug 2012 15:54:00 +0000 (17:54 +0200)
To be completed by an extra merge containing the remaining
work-in-progress stuff of pad/wiki refactoring.

bzr revid: odo@openerp.com-20120829155400-memirrjghutw5pl7


Trivial merge