]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Wed, 12 Nov 2008 11:54:29 +0000 (12:54 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 12 Nov 2008 11:54:29 +0000 (12:54 +0100)
commitfdb4fad223cac4b5a87f7da2de9fc7dc1b9a8f8b
treebf69fb4d0c69d2e219be0fd14dd2cd6913a01470
parent9b20e0a24ef0bba1a04eb5d29a5a855f242cd933
parent2c858c9c95e287ebe3740a94f983f6ae9d6fb080
Merge commit 'upstream/master' into pub/master