| commit | 1e29bd2217f4320d3df156c448bf16aaeaec53d6 | |
| author | Lukas Fleischer <archlinux@cryptocrack.de> | |
| Fri, 9 Mar 2012 08:27:49 +0000 (9 09:27 +0100) | ||
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | |
| Fri, 9 Mar 2012 08:27:49 +0000 (9 09:27 +0100) | ||
| tree | 97fcadd8516f137d598ed30c392b9922176ab2ab | treesnapshot (tar.gz zip) |
| parent | f5e1652bf95ed7b63a27042d8bb8b1195d7c9158 | commitdiff |
| parent | bfb25807c49d3f35cdce91947a442455e1940392 | commitdiff |
Merge branch 'maint'
Conflicts:
UPGRADING
web/lib/config.inc.php.proto
Conflicts:
UPGRADING
web/lib/config.inc.php.proto
| UPGRADING | diff1 | diff2 | blobhistory |
| web/lib/translator.inc.php | diff1 | diff2 | blobhistory |