Merge commit 'refs/merge-requests/134' of git://gitorious.org/gitorious/mainline...
authorChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:23:21 +0000 (22:23 +0100)
committerChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:23:21 +0000 (22:23 +0100)
commit84232dfda48cf73524cdb5d10d5bfb7e4d468175
treed53c7e21ae98c8650d7cb417bf255a7a2e41f9d2
parent5c67ed2f1e44d0b087407b25328dc2cc245674ec
parent3818d0f8f9ec2942066386dc0e07405c001b3e7c
Merge commit 'refs/merge-requests/134' of git://gitorious.org/gitorious/mainline into merge-requests/134