]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 16:07:13 +0000 (17:07 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 16:07:13 +0000 (17:07 +0100)
commit92ba3bb4a1b84ffa791fa0be88529e96fd71b157
treeed917c575f7ff4f2098f57cf7067c967ad0727e8
parent75a4b500a79d182c85d82a1bbdf3fd1650078746
parent4991cb441e6898a2d350c43c8618ce728331b9a4
Merge commit 'upstream/master'