[MERGE] HR fpi
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 12 Nov 2012 13:26:49 +0000 (14:26 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 12 Nov 2012 13:26:49 +0000 (14:26 +0100)
bzr revid: fp@tinyerp.com-20121112132649-xplm23hbgq0r6zzk


Trivial merge