Merge branch 'master' into translations
commit5da96a9706e119108b4dd078271917a2f06ee468
authorsmariot <smariot@gmail.com>
Wed, 1 Jul 2009 01:46:15 +0000 (1 01:46 +0000)
committersmariot <smariot@gmail.com>
Wed, 1 Jul 2009 01:46:15 +0000 (1 01:46 +0000)
treed5917d052a3a24002b4d48296c711643ed5be938
parentb362a725e2bee434e540346f5e03371cad515801
parenta34d534df22efeac9e77eb4380095133cbf00be5
Merge branch 'master' into translations