Merge branch 'future'
authorreichi <stephan@reichholf.net>
Mon, 31 Oct 2011 11:21:54 +0000 (12:21 +0100)
committerreichi <stephan@reichholf.net>
Mon, 31 Oct 2011 11:21:54 +0000 (12:21 +0100)
commit727fda10a49a0344780673ac64e02e27f3c2a756
treedd42e4489a2c2744485ea6fa1f8897a63c83060d
parent3bbe79aa4ee3d59e9484e6d7108e42b1cc6e057e
parentf334ea64602d6b1a45f384e8b46aec2ac295f9bc
Merge branch 'future'