Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Fri, 14 Oct 2011 10:35:51 +0000 (12:35 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 14 Oct 2011 10:35:51 +0000 (12:35 +0200)
commit3b7246165cc303d00a4f7e820811e9d61bf20dda
treec0627a1cba38bf6b9a6c64adc95764999e4edb68
parent2f791fdc611c9720ee35cc07e7fe07d66d41a2fd
parent7d3c2cf870c6b789d9fbc2aff3eee2875f93a5cf
Merge branch 'master' of gitorious.org:gitorious/mainline