| commit | 9b3d4d13339ee0f20ddb6d19bf294e3a2e97aabd | |
| author | Peter TB Brett <peter@peter-b.co.uk> | |
| Sat, 17 Nov 2012 20:35:18 +0000 (17 20:35 +0000) | ||
| committer | Peter TB Brett <peter@peter-b.co.uk> | |
| Sat, 17 Nov 2012 20:35:18 +0000 (17 20:35 +0000) | ||
| tree | 682ed59ab3f723dc6ce1a8c19ef303499a57960d | treesnapshot (tar.gz zip) |
| parent | 928786d234aa95d368fe3cc8c62783cc5717dfe2 | commitdiff |
| parent | 846f4cfa3a6c75e7e443a95a1f0e969f0334d313 | commitdiff |
Merge branch 'wiki-import' into stable-1.8
Conflicts:
configure.ac
docs/Makefile.am
Conflicts:
configure.ac
docs/Makefile.am
| configure.ac | diff1 | diff2 | blobhistory |
| docs/Makefile.am | diff1 | diff2 | blobhistory |