Merge remote branch 'origin/bug_314_remove_default_settings_menu_entry' into 2.8
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:42:10 +0000 (18:42 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:42:10 +0000 (18:42 +0200)
commit1ef0edc577d049e36a23de7028a9a05a6ebe2935
tree4d85678cd86cce8277dbc0439dfdea8c797946d0
parent2d8a1e5cd959934cad2ed4bf693c2a1b4a037254
parent9f1ad26a6813358f8c6d4b94fca9f6d51b6159b1
Merge remote branch 'origin/bug_314_remove_default_settings_menu_entry' into 2.8
data/menu.xml