Merge commit 'upstream/2.6.0'
authorJoel Rosdahl <joel@debian.org>
Sun, 16 May 2010 13:32:11 +0000 (15:32 +0200)
committerJoel Rosdahl <joel@debian.org>
Sun, 16 May 2010 13:32:11 +0000 (15:32 +0200)
commita9dccc781213e8d837b376ff067a5f3ab8db824d
tree628f63a6eb51d5b84fd88b47b4c52ec8df5cec72
parentd61d1ded23b20e34ea1e8d785823e723e5154234
parent842f2fec1341cb3b21eda5136210c38777cbfbf7
Merge commit 'upstream/2.6.0'

Conflicts:
doc/sphinx/conf.py