diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-06-24 09:54:31 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-06-24 09:54:31 +0530 |
| commit | 09533ac1125fb4c518c540faa2155bc0aadd6c70 (patch) | |
| tree | cf09ba4b443c471e3f34b3901965370bdabe5f86 /addons/document/document_view.xml | |
| parent | 0c307a4a12a22490f2e3fee2cddbe69d0a38e6b0 (diff) | |
| parent | 09fa5d4fb2c25737e2800b5d0a21d1f1aaafc216 (diff) | |
[MERGE] Merge branch with trunk addons and remove the conflicts
bzr revid: mra@mra-laptop-20100624042431-j6jpehkhemxv1k01
Diffstat (limited to 'addons/document/document_view.xml')
0 files changed, 0 insertions, 0 deletions