]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:29:47 +0000 (16:29 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:29:47 +0000 (16:29 +0100)
commitb78a9e270424574b3f585fce9d83e7ba3296267f
tree318b10bc565d16540c48759b7e855e66716280a5
parent713e114f132096c5aec01265ca9703708b47af4f
parent98ffa6e15552852d15191db39a65fea345509d50
Merge commit 'upstream/master'