]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 27 Aug 2009 17:56:37 +0000 (19:56 +0200)
committerintrigeri <intrigeri@boum.org>
Thu, 27 Aug 2009 17:56:37 +0000 (19:56 +0200)
commit0c032b0ccb3766c422980a0e956dacbe44cfa021
tree3f7d5d2821fee7f336bdabfa56e71f7048e77569
parent496e8523c6706d096f1b794e3f3ba5dd2fa260f3
parent5e515b493c00c70095aeb8bad1e0b7757ed943db
Merge commit 'upstream/master' into prv/po