clean merge conflict
authorRobert Kaiser <kairo@kairo.at>
Sun, 30 Nov 2008 21:56:30 +0000 (22:56 +0100)
committerRobert Kaiser <kairo@kairo.at>
Sun, 30 Nov 2008 21:56:30 +0000 (22:56 +0100)
commitc09bd2ddc32d2bd0de40b939b6641684c4f0b97b
treebd4e34b16862ac3b6c859066f5f1ba865c486c93
parentacb63e9c6fb6767d7b468ad41950197407b1d985
parentc710949da7cada91a80f0b6cece1a7fc0388c640
clean merge conflict
LCARStrek/navigator/navigator.css