Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Tue, 4 Oct 2011 06:40:12 +0000 (08:40 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Tue, 4 Oct 2011 06:40:12 +0000 (08:40 +0200)
commit3f3a9c045591a708df9c8bb47d5f3ddcaf4658ca
treebeae1dee3fec3c9d11364bc8a032a4cc7049e600
parent18a8fb100ce8f6a96951c10f6ae492cc010f393a
parent17bad329e7356d50fc2e6bd2822281e92070461a
Merge branch 'master' into cbrutail/map-lightspeed