[MERGE]: with main
authorajay javiya (OpenERP) <aja@tinyerp.com>
Thu, 23 Jan 2014 05:09:30 +0000 (10:39 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Thu, 23 Jan 2014 05:09:30 +0000 (10:39 +0530)
commit2577be53ac0c85840854239ee998f144cf0f33a6
tree8485f8227e220290c8a10602e83b3a8432b8cbec
parenta7a07a33341ead4237d22c250f7e49c58a1bf398
parentb32fbce49c157c5b4427f397918a0aa9ab1911db
[MERGE]: with main

bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
addons/sale/res_config.py
addons/website/views/snippets.xml