Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 19 Nov 2014 22:42:49 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 19 Nov 2014 22:42:49 +0000 (23:42 +0100)
commit4170cd8812047b74fa153c3acd329b942066108a
tree3c7095fa877bd3083804e98b9c9817f0d73e5c04
parente5ece8625d02733b1710e0abba2910e9da5aee9b
parent529e920b2cc4673188dd209f91196a35dfdb7790
Merge remote-tracking branch 'odoo/7.0' into 7.0