| commit | ce7e6feaf528cdba079f707670818c83e436645f | |
| author | Piotr Przybylski <piotrprz@gmail.com> | |
| Tue, 2 Aug 2011 22:25:43 +0000 (3 00:25 +0200) | ||
| committer | Piotr Przybylski <piotrprz@gmail.com> | |
| Tue, 2 Aug 2011 22:25:43 +0000 (3 00:25 +0200) | ||
| tree | 6e20a60ca3b21f16d3fb791b51d01fdd91500ed8 | treesnapshot (tar.gz zip) |
| parent | b41976e5520c87a066c8da73b7972d8f7c6ff2c0 | commitdiff |
| parent | 54fbcaa1403e9d97e41fb28c1751f6051037a295 | commitdiff |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
libraries/export/htmlword.php
libraries/export/latex.php
libraries/export/odt.php
libraries/export/sql.php
libraries/export/texytext.php
libraries/export/xml.php
Conflicts:
libraries/export/htmlword.php
libraries/export/latex.php
libraries/export/odt.php
libraries/export/sql.php
libraries/export/texytext.php
libraries/export/xml.php
12 files changed: