Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)
commit797a1799e348e38e1adba2217cbb55ac6e970c55
tree57f3a0b5f1f8a699d26098ccccc0a389dc38ec94
parentb7b33d81f3b12358af0e7992faa4ce7b6613e447
parenta733dd2cc67aaef9a9d9097bd1dc9b331aad72de
Merge branch 'master' into cbrutail/map-lightspeed