]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Sun, 9 Nov 2008 00:51:00 +0000 (01:51 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 9 Nov 2008 00:51:00 +0000 (01:51 +0100)
commitd528db30216af50ac0c3c611a22a3deef25ab026
tree9878f6e955c92fae68090c87c745bf15bbbfb1ce
parenta4a1b8e6532b38cc3d045647b568cb2e6d737524
parent17f01c3237dd9a91ccb4bbc3ec13d75dc17285a0
Merge commit 'origin/master'