Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Wed, 11 May 2011 12:24:23 +0000 (14:24 +0200)
committerChristian Johansen <christian@gitorious.org>
Wed, 11 May 2011 12:24:23 +0000 (14:24 +0200)
commite110332b8eaaf7c6fe2dc41f6112da42c4f64661
treec5ec16d10b7612050bfa84b233fa43064e4beca8
parent6b6dabc9998835a4f332797c8921fac0796dca82
parent470de0a504dadde4cf61d4b29678438215a7e9aa
Merge branch 'master' of gitorious.org:gitorious/mainline