Merge branch 'master' of git://gitorious.org/magit/mainline
commit060b2fbbddf660e828c5427cb1f0ae27f28b69b3
authorAlex Ott <alexott@gmail.com>
Wed, 12 Nov 2008 15:53:35 +0000 (12 16:53 +0100)
committerAlex Ott <alexott@gmail.com>
Wed, 12 Nov 2008 15:53:35 +0000 (12 16:53 +0100)
tree85eb5d118cb4e7ddaea899efe165e36f64ef8ba4
parent6d6a864d71a7e6ae49378ccef34c09d92137d07a
parentb45a99c88c6faa1a66e9eb7e9f0832cb4a327fdf
Merge branch 'master' of git://gitorious.org/magit/mainline