Merge remote branch 'i18n/master'
authorPatrick Aljord <patcito@gmail.com>
Mon, 17 Jan 2011 19:33:49 +0000 (14:33 -0500)
committerPatrick Aljord <patcito@gmail.com>
Mon, 17 Jan 2011 19:33:49 +0000 (14:33 -0500)
commitac0db5a4b6f846b5aa2e32106fb0beb44efd2166
tree7f5f017d3fbc8a4f60e5b9b266370584aab64cff
parentc9554cea67638aec73706d8726044513e7114fcd
parentc68be2a623741ae5b01db8073d1913dfb91cba1c
Merge remote branch 'i18n/master'