]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 20 Dec 2010 13:27:21 +0000 (14:27 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 20 Dec 2010 13:27:21 +0000 (14:27 +0100)
commit75196e76b627709a6ecae3fa948e1fba7928a5ce
tree6aa2baeb9cc68f98ca256ce0ff5cb20909f52ef9
parent8c2962ec48ae57605d6d0e297be437a97b6229ca
parente5ed3c9e3801360cc00ce4f4f325f68ac0770bff
Merge remote branch 'upstream/master' into prv/po