Merge branch 'master' into docfix
authorSebastian Pipping <sebastian@pipping.org>
Mon, 13 Dec 2010 07:44:50 +0000 (08:44 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 13 Dec 2010 07:44:50 +0000 (08:44 +0100)
commit295b5017e289ef102276c3ce151f31f6ce8ee66d
tree372e3c592a85447b19e30938dc700cee84529553
parent55b0c75a0dc70a1dee2e9d651b1ae05f2d0a0c43
parentd0f88d6605629b28092b3bf67e8f68f7ee7ced9d
Merge branch 'master' into docfix