]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)
committerintrigeri <intrigeri@boum.org>
Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)
commita06b8590cebfbc7dc7075b72f8cabd7279a88c59
tree845fc694c2eeaf22c5dce5c3868de0281217c464
parentcf43ae5a1f5460a98cdd7acb36c0691b2eec988f
parentc68413dccecfb303f8cfc803672bf132af025968
Merge commit 'upstream/master' into prv/po