diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-10-25 21:35:52 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-25 21:35:52 +0200 |
commit | d9b0030b0c792eb4d5c4fa8924d62033e7c0a9c9 (patch) | |
tree | 9d8d97a7d7c16711ee41181cc927b4ba7e3a0af9 /po | |
parent | 19527ccc67bf7f7554017cbbe856cbcca929f730 (diff) | |
parent | 8373fc460a61f38f0b3104ea1e6d38f7daacc60e (diff) |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb.setup
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions