diff options
| author | Tejas Tank <tta@openerp.com> | 2012-04-23 11:28:34 +0530 |
|---|---|---|
| committer | Tejas Tank <tta@openerp.com> | 2012-04-23 11:28:34 +0530 |
| commit | d267222a65493dc84fa52df6b5704d730311940d (patch) | |
| tree | 71b5129bd92b82de1ef5f2669d8107e744798300 /addons/web_etherpad/static/src/xml/etherpad.xml | |
| parent | ccb2731a49ea33b1a0a3a1dfca5a09ce7163e300 (diff) | |
| parent | 869d9375d9fddf09d1a5c63b6951be83ef690be1 (diff) | |
Merge with latest trunk
bzr revid: tta@openerp.com-20120423055834-5prw2et0k3avlocx
Diffstat (limited to 'addons/web_etherpad/static/src/xml/etherpad.xml')
0 files changed, 0 insertions, 0 deletions