Merge branch 'update' 2.0.0.-pre1
authorThomas Hochstein <thh@inter.net>
Fri, 7 Oct 2011 10:30:21 +0000 (12:30 +0200)
committerThomas Hochstein <thh@inter.net>
Fri, 7 Oct 2011 10:30:21 +0000 (12:30 +0200)
Conflicts:
dnq-faq (last-modified)

Signed-off-by: Thomas Hochstein <thh@inter.net>

Trivial merge
This page took 0.009379 seconds and 4 git commands to generate.