Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Mon, 4 Jul 2011 08:13:51 +0000 (10:13 +0200)
committerChristian Johansen <christian@gitorious.org>
Mon, 4 Jul 2011 08:13:51 +0000 (10:13 +0200)
commita2b56433197530d9471cb6d6b0546b01899513c7
tree49c1f2f511d8de6549aab86a4ecde80b1e5ca9e4
parentb23a55f81858c922e32ed349fc69116717b96eba
parentafbd864fbd1b928bf6045e13b447494c1da3fc93
Merge branch 'master' of gitorious.org:gitorious/mainline