Merge remote branch 'disk/i18n' into offline
authorDavid A. Cuadrado <krawek@gmail.com>
Mon, 11 Jan 2010 20:41:43 +0000 (15:41 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Mon, 11 Jan 2010 20:41:43 +0000 (15:41 -0500)
commite1355d1cad0f804767c414074beb7a466a6dfa8c
tree83ba58c77f7da7ebd2e9a8152dfdbbed5bd066d0
parent6d68dd24cee3f0b3725ebe5618ce1576d84f22b9
parent6498f377f090e60b12ca703000a15b75fb854a5d
Merge remote branch 'disk/i18n' into offline