Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 11 Oct 2011 11:49:59 +0000 (13:49 +0200)
committerChristian Johansen <christian@gitorious.org>
Tue, 11 Oct 2011 11:49:59 +0000 (13:49 +0200)
commit6dfff2e93207f4ed3da85211c507b74816eaff6e
treef1f67894c912aa0c4ad13f6ca246875d3b348712
parent78a88c9b34ea668a537e52e655c1a97188ef32dc
parent726404c13d4d4496e12a731ce69f8e3b74fe0d69
Merge branch 'master' of gitorious.org:gitorious/mainline