Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 12 Nov 2014 22:42:45 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 12 Nov 2014 22:42:45 +0000 (23:42 +0100)
commit151dddd6388b0d2d6f0c2114c955e4911b359fe7
treeeffd8c55efd224394981d173ce6d464254a13655
parenta16ddf2a905cb09bc4267becb67817bb1c1dc598
parent16900c8ac4e40ad88ca91eae074d42c5fcec04a4
Merge remote-tracking branch 'odoo/7.0' into 7.0