Merge commit 'refs/merge-requests/135' of git://gitorious.org/gitorious/mainline...
authorChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:21:20 +0000 (22:21 +0100)
committerChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:21:20 +0000 (22:21 +0100)
commit5c67ed2f1e44d0b087407b25328dc2cc245674ec
tree1921577238751e8eaf1f45c0dcdab21483517cb7
parent211cb63ef33a3c15ab5e39c42ccd0dd515f062a8
parentc0437d229582233ebcd7acf5c238144aa328f2a2
Merge commit 'refs/merge-requests/135' of git://gitorious.org/gitorious/mainline into merge-requests/135