Merge branch 'master' into map_double_click_zoom map_double_click_zoom
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:52:25 +0000 (15:52 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:52:25 +0000 (15:52 +0300)
commitac3e477b83b23ba94af0d49c4bc085623d96d8d6
tree37381161fee058042ffd156170abb804e4e9cd4c
parent7613ed319bc880ce07b0a8a97e3977a1060895cb
parent5b9eedb4aa843c7d4e0e9dda1e23c94356af37e0
Merge branch 'master' into map_double_click_zoom