![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200) | ||
| commit | 66ade8b7294e88030555575fdba4e90867f62599 | |
| tree | 8f796cd824be5978ff1d7ff3ba4797f4f4602156 | tree | snapshot |
| parent | 1ec7adf09a1df8b4b38330869c95a12eca15017a | commit | diff |
| parent | 7fb30eb66bae170357dc3b568ff1934ad9ed2c2d | commit | diff |
Merge branch 'sh/master'
Conflicts:
configure.in
Conflicts:
configure.in