[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 15:57:23 +0000 (17:57 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 15:57:23 +0000 (17:57 +0200)
commitf091e9d6e530720ef6e6d8b72251e509adb3ebc5
treea4449b0656445db8a68b87dd95af4a1e64fec496
parent133038c7226702960f955de1f852c6e07f66ed32
parent668fb8a54231e2f43c1e29934193637fc2d8c6ff
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140411155723-pqe8ofxh060afiuj
addons/gamification/models/badge.py