Merge commit 'refs/merge-requests/141' of git://gitorious.org/gitorious/mainline...
authorChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:19:54 +0000 (22:19 +0100)
committerChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:19:54 +0000 (22:19 +0100)
commit211cb63ef33a3c15ab5e39c42ccd0dd515f062a8
tree49e2c25dadfa77dc55ef3909e485b48101b40547
parentc172de77ec5722e29339c76d80eacb7fb0f2e136
parentb0f170937533e648b09a6cbfac80efb5acf27e47
Merge commit 'refs/merge-requests/141' of git://gitorious.org/gitorious/mainline into merge-requests/141