Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@gitorious.com>
Tue, 8 Jan 2013 21:03:16 +0000 (22:03 +0100)
committerThomas Kjeldahl Nilsson <thomas@gitorious.com>
Tue, 8 Jan 2013 21:03:16 +0000 (22:03 +0100)
commitb01f89bca8b647fee0a2b85986b81934b570f829
treea62e4522d9b8d41ae9f1d410ef4cb329c315b763
parentb7cdb5ffc09b1892d7cb23b34bf56980190b3ec4
parent7aee937c43644bd85069bbb0c5b48a6293c90bb3
Merge branch 'master' of gitorious.org:gitorious/mainline