]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/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)
commit51de5d80bd318b52efecef4253eeab8292139922
treeed917c575f7ff4f2098f57cf7067c967ad0727e8
parented1673929562adb8747b2e6dca424df92d210013
parent4991cb441e6898a2d350c43c8618ce728331b9a4
Merge commit 'upstream/master' into pub/master