]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sat, 17 Jan 2009 23:38:31 +0000 (00:38 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 17 Jan 2009 23:38:31 +0000 (00:38 +0100)
commite9e75f5f29d78b0631f98d9b0fa93184fcb181fe
tree32b149ff7fa15747d90b9d20ca0296d4006221cc
parent832d4d31d177d5d5f848250496048a00e9d70e2f
parentf0c3cc0363ce6da4c3f239decc9fe0e5ed8d624b
Merge commit 'upstream/master' into prv/po

Conflicts:

t/syntax.t
t/syntax.t