[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Thu, 26 Dec 2013 13:26:25 +0000 (14:26 +0100)
committerGery Debongnie <ged@openerp.com>
Thu, 26 Dec 2013 13:26:25 +0000 (14:26 +0100)
commit9dfb5de2f81ba07cb349687e35a1249c9e0b5a94
tree33f50566d6308879fec88a1601ef0f665c7da6ac
parent50f183d4ed4fe20799c85313c1795204ce6b66be
parent67e479e96e97be4d9aaba21a19ebf43511407ac8
[MERGE] merge from trunk

bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
addons/hr_recruitment/hr_recruitment_view.xml
addons/sale/i18n/zh_TW.po