diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-10-11 16:36:35 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-10-11 16:36:35 +0200 |
| commit | 59d1bc014d3471dbe6487668b56e53efb0292609 (patch) | |
| tree | 3abaeaa723af0b1341eba123f539b45eb6600b17 /addons/google_docs/static/src/xml | |
| parent | 3a5cef75eb65605bb86c10726b2b39674dff6dee (diff) | |
| parent | c383d9d7dae7705e0a69b960f381557ceadbf92d (diff) | |
[MERGE] Merge unsorted fixes from trunk-fp (+fix fp-style merge)
bzr revid: odo@openerp.com-20121011143635-bba3q7gj8y9cx7k1
Diffstat (limited to 'addons/google_docs/static/src/xml')
0 files changed, 0 insertions, 0 deletions