Merge branch 'master' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Sat, 29 Jan 2011 14:52:48 +0000 (15:52 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sat, 29 Jan 2011 14:52:48 +0000 (15:52 +0100)
commit56010435689842528c768d8080899846c44f401d
tree3ba2a1daa7f1cbf6a6991c908cbcab1a3e2eca69
parentd5501e7bbde455c05c1bbd82f0871f1f508eb935
parent8b3848e030b2eff0569823cb0f3d4e467248ab3b
Merge branch 'master' into experimental