Merge branch 'master' into master-forum-extension-tpa
authorFabien Pinckaers <fp@openerp.com>
Sun, 5 Oct 2014 13:35:49 +0000 (15:35 +0200)
committerFabien Pinckaers <fp@openerp.com>
Sun, 5 Oct 2014 13:35:49 +0000 (15:35 +0200)
commit9e682ab4920dcbd3986e619c046f69d0b1bff179
tree70f55545926892d55ce42675637cb9cb635d66c2
parent5c8ee5f415f749926a150e854208b44fe4859608
parent4e272542ea1681277e087f59a56b5cf62eafc64b
Merge branch 'master' into master-forum-extension-tpa