Merge branch 'stable' into tunnel
authorHenning Rogge <hrogge@googlemail.com>
Mon, 25 Jan 2010 19:12:14 +0000 (20:12 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 25 Jan 2010 19:12:14 +0000 (20:12 +0100)
commite91543250f44bfc9f49d830e53214fd4de5a0924
tree634e20622a237d6d611b025c2405d4614cd72f9b
parentaa920964859df0b8ba17b50e618591ec76ad5a9c
parentd86becf006da2bc17f18f9528b2083115655554a
Merge branch 'stable' into tunnel