Merge commit 'refs/merge-requests/2226' of git://gitorious.org/gitorious/mainline...
authorChristian Johansen <christian@shortcut.no>
Fri, 4 Mar 2011 12:30:54 +0000 (13:30 +0100)
committerChristian Johansen <christian@shortcut.no>
Fri, 4 Mar 2011 12:30:54 +0000 (13:30 +0100)
commitad67ea9cf071460364976521b694263b2da9ccdd
tree5439636747a4bbd0aa996f06fc36b64c848f5c15
parent07f4776fd9b290ed53bf7ef55f155c44778c26b9
parent55344a6f22e869e4397351cce6c816d5073dd98b
Merge commit 'refs/merge-requests/2226' of git://gitorious.org/gitorious/mainline into merge-requests/2226