Merge branch 'master' of gitorious.org:gitorious/mainline v2.1.0
authorChristian Johansen <christian@gitorious.org>
Fri, 21 Oct 2011 21:39:15 +0000 (23:39 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 21 Oct 2011 21:39:15 +0000 (23:39 +0200)
commit029c723fe7b5b624f891ab69fda5f49238bf55fb
tree40ef0aa66d7ad9b1e976a35edf895cdaea4a6a7f
parent56162bfa6444dcfc6724a6fd8afa7ce9dbd43042
parent6650126823cdb64a1f1e43f7475414ac84fba6ce
Merge branch 'master' of gitorious.org:gitorious/mainline