]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50bc05e 8084c79)
Merge remote-tracking branch 'intrigeri/po'
authorJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:36:30 +0000 (12:36 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:36:30 +0000 (12:36 -0400)
1  2 
IkiWiki/Plugin/po.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Plugin/po.pm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.