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)
commit4b8a7a66d348e483744187a1545f7ca36ea3b95c
tree662b10f6e7c346406eea5ae8ee48fcf14d64542e
parentf8763e2bf8ed7a315ea713542069b0115fe67acc
parentcb8ac42cf67cbb1c36f0cf4f2740762c7820b635
Merge branch 'update'

Conflicts:
dnq-faq (last-modified)

Signed-off-by: Thomas Hochstein <thh@inter.net>
This page took 0.009471 seconds and 4 git commands to generate.