| commit | a0a4628b11fa8fc89fc3e956fa5c4e5c863c729f | |
| author | Piotr Przybylski <piotrprz@gmail.com> | |
| Thu, 14 Jul 2011 20:38:20 +0000 (14 22:38 +0200) | ||
| committer | Piotr Przybylski <piotrprz@gmail.com> | |
| Thu, 14 Jul 2011 20:38:20 +0000 (14 22:38 +0200) | ||
| tree | 57263872329ee6fbc11146cccef122f43786a509 | treesnapshot (tar.gz zip) |
| parent | f7591dd5631dbd2c201147bb7683982888f48a94 | commitdiff |
| parent | 291e3b6a9f1024b05306d1c06782a7ef76e5827a | commitdiff |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
libraries/export/latex.php
libraries/export/odt.php
libraries/export/texytext.php
libraries/export/xml.php
Conflicts:
libraries/export/latex.php
libraries/export/odt.php
libraries/export/texytext.php
libraries/export/xml.php