diff options
| author | intrigeri <intrigeri@boum.org> | 2008-11-06 12:28:31 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-11-06 12:28:31 +0100 |
| commit | 1f54c13ec24977988a303f004f3fc08ee2e01abc (patch) | |
| tree | 6e199ad04a48100286304ef53095e720ac72bca6 /doc/sandbox.mdwn | |
| parent | bd2dd8c60336ad7a03194d2a53f5409a620e484d (diff) | |
| parent | 17bd930bc9f4192e084a223cf57af94680741853 (diff) | |
Merge commit 'upstream/po' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/sandbox.mdwn')
0 files changed, 0 insertions, 0 deletions