Merge branch 'master' into experimental
authorFlorian Schweikert <kelvan@logic.at>
Fri, 7 Oct 2011 00:41:01 +0000 (02:41 +0200)
committerFlorian Schweikert <kelvan@logic.at>
Fri, 7 Oct 2011 00:41:01 +0000 (02:41 +0200)
commita8e1002644769c56bfc20305f897fc3084526ebe
tree09213640b05e540cad04b4fb4587977a66781b12
parentf062ec8e8eb44476520c04b860c346f8b67a8a13
parent7eaceb3fe34c376eddad63da4eaaca2c2aa259f3
Merge branch 'master' into experimental

Conflicts:
gotovienna/routing.py
itip
scotty
gotovienna/routing.py
itip
scotty