Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 15 Jun 2011 17:21:54 +0000 (19:21 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 15 Jun 2011 17:21:54 +0000 (19:21 +0200)
commit7579dfa9573f9964e29e52e1aac1dec05e4f77a4
treebcba6735f7e22486464aaf45b6a8ba66b2ce84dd
parent11d8cc74746e130ba048f2c9942226954b1b7c6c
parent7952e74e951e659a1721bc8e2ddff421947132f8
Merge branch 'master' into cbrutail/map-lightspeed