]> sipb.mit.edu Git - ikiwiki.git/commit
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 23 Aug 2010 07:36:22 +0000 (09:36 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 23 Aug 2010 07:36:22 +0000 (09:36 +0200)
commit8c2962ec48ae57605d6d0e297be437a97b6229ca
treefb3ed28dde3e07fa4bcbd8ad1a2ed1fce8ecd1a2
parente85c15e75bc7a24be537d905a53877f462c2d8cd
parent5de07f59be82aeb7b4935fc134e023628eddb49c
Merge remote branch 'upstream/master' into prv/po