Merge branch 'master' into stable
authorSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 17:24:06 +0000 (19:24 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 17:24:06 +0000 (19:24 +0200)
commitade0b7669be72b77c56d85dcc78761d05815d347
treeafb62902bb7db002437d037bbf01f4f5bd390e65
parent5a33ee4b485a902051beeece531d1e70b1fa73c0
parentf3d1fe4a46885d138ad79924691d1b4de8131321
Merge branch 'master' into stable