Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 14 Jul 2011 08:55:04 +0000 (10:55 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 14 Jul 2011 08:55:04 +0000 (10:55 +0200)
commitf6d605645f0f6b9240193244d35cf8419dca7543
tree126cd91061488e3e16f7a82baa467c2a0ff4fd64
parent0499de644939b4e9423ce922b60fed03f3556d5a
parent7fbc9ab19fe7bf8966724711af2d59020097cf08
Merge branch 'master' into cbrutail/map-lightspeed