Code

Merge branch 'sh/next'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 16:51:26 +0000 (17:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 16:51:26 +0000 (17:51 +0100)
commit979041ee0516ee373ef5d1d90f749864c3baef38
tree50ca6fef0df64e8d7574abad6953be5b35b949f2
parentab37cef6e61fa75ea0f92d4be22ef5d80b012780
parent3f5a9023cef447efb4ec998a8764a6137f65c97a
Merge branch 'sh/next'

Conflicts:

ChangeLog
ChangeLog