Merge commit 'discon/master' into ja-i18n
authorPatrick Aljord <patcito@gmail.com>
Sun, 6 Jun 2010 02:18:04 +0000 (21:18 -0500)
committerPatrick Aljord <patcito@gmail.com>
Sun, 6 Jun 2010 02:18:04 +0000 (21:18 -0500)
commit222506c1da9619d80242b2d7972ac5722489595e
treecc8d33934b3d3cb476984fb5f771d93c7e819137
parentb4771a30876efacfc104356710b11e3c700bcbae
parent0c1828928ca9bec14a6b593f02ee72f6e963f88e
Merge commit 'discon/master' into ja-i18n