]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:14:07 +0000 (14:14 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:14:07 +0000 (14:14 +0100)
commit6975f9e3f4e06fb55cc8c9795c503019d2e8d08b
tree2209ef7f111b18ec3ef4d2b4b0d4ef69d1648665
parent2da98a585e44bba0035b50040f59b5ed17d8f76c
parent71ea77a7806eadefd2f7aae839dc7d7346aad433
Merge commit 'upstream/master'