Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 11 Oct 2011 11:49:01 +0000 (13:49 +0200)
committerChristian Johansen <christian@gitorious.org>
Tue, 11 Oct 2011 11:49:01 +0000 (13:49 +0200)
commit78a88c9b34ea668a537e52e655c1a97188ef32dc
tree2d4e7c0dbbc622d943f8f9e4712debdf0df9070f
parenta41c57ffb8cc3348c55955724cdb45cd5da7b31d
parentfe0bb71f909db96d4ddd3ce06ac5297d5f32a308
Merge branch 'master' of gitorious.org:gitorious/mainline