Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 19 Apr 2011 07:24:03 +0000 (09:24 +0200)
committerChristian Johansen <christian@gitorious.org>
Tue, 19 Apr 2011 07:24:03 +0000 (09:24 +0200)
commit8de78ffb8f3a27a8cfaa93522b7dea32493354f9
treec32f9ef5f3b2c789557119938ee7f507d5c256bd
parent8fc1d86620d0f180c29033319f2848106b375729
parente2e70edd42ac1c00dab518d61d566ee3fec929db
Merge branch 'master' of gitorious.org:gitorious/mainline