]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:42 +0000 (12:57 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 11:57:42 +0000 (12:57 +0100)
commit2da98a585e44bba0035b50040f59b5ed17d8f76c
treed7dc6fb88ab1d559616436e82ea3b6c386a9532a
parent715bad7967c763773d04a4d54ca81c9316c6e2de
parentebd9f4ce8ac37f5860a8c3eecaae39bd7ddb03e7
Merge commit 'upstream/master'