Merge branch 'master' of git.shortcut.no:gitorious/gitorious
authorOle Martin Kristiansen <ole@shortcut.no>
Wed, 2 Jun 2010 08:13:29 +0000 (10:13 +0200)
committerOle Martin Kristiansen <ole@shortcut.no>
Wed, 2 Jun 2010 08:13:29 +0000 (10:13 +0200)
commitce1894cc78f7d0f6c38bc51181ed3dc11cf0feae
tree9e04968a72584d3aaab258c5478bf31f0373ff1b
parentdc0052d32c1e30bcbd6dc0bd4543855f7a74fd37
parentf6a3129279f38ed0587fd66e375999b84a05d486
Merge branch 'master' of git.shortcut.no:gitorious/gitorious