Merge branch 'translate-ja' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 9 Oct 2012 18:03:08 +0000 (20:03 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 9 Oct 2012 18:03:08 +0000 (20:03 +0200)
commit200ef4df1a0936ddac7362a19faf7f24722011cc
tree02050b69b3da584d5f28e740ffd9ab0acadb1e97
parentef304a97a23d2f6162d38e65550988f22d16af04
parent77bbb7fbdebc9f9cfc0de2d8242c3a93a9f2ff66
Merge branch 'translate-ja' into next