[MERGE] project: migrate to aliases
authorChristophe Simonis <chs@openerp.com>
Fri, 23 Aug 2013 13:03:55 +0000 (15:03 +0200)
committerChristophe Simonis <chs@openerp.com>
Fri, 23 Aug 2013 13:03:55 +0000 (15:03 +0200)
bzr revid: chs@openerp.com-20130823130355-5f5mi76brx1xjdge


Trivial merge