Merge branch 'stable' into tunnel
authorHenning Rogge <hrogge@googlemail.com>
Tue, 5 Jan 2010 17:29:18 +0000 (18:29 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 5 Jan 2010 17:29:18 +0000 (18:29 +0100)
commitba98dedbc508ce94a34d1c74e477ce657f960231
tree795e881402b1bdcf759200c7ff10357c6f3042bf
parent8e35210659bda17d19c595122ff1146325dabee8
parent91b810c561514b6dda8152f643a874aa1d5362d8
Merge branch 'stable' into tunnel