Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 18 Jun 2011 22:05:21 +0000 (00:05 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 18 Jun 2011 22:05:21 +0000 (00:05 +0200)
commit23ada95ee7bc58d9f4f225c830dadd19000ec8c3
tree648cad715786d5fca97d23b5d01d7abb8e2dd4d8
parent7049f3203500c1538e417c499cf053e71e47fd64
parent9b55b717831f3fa3cd0e4fd0b6dbec56bad19e58
Merge branch 'master' into cbrutail/map-lightspeed