Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.com>
Tue, 22 Oct 2013 07:39:48 +0000 (09:39 +0200)
committerChristian Johansen <christian@gitorious.com>
Tue, 22 Oct 2013 07:39:48 +0000 (09:39 +0200)
commit4015772fa43b7ab23e40f04dfec7173d9b0f846c
treeb79bd2f2f669f2b13abecac117eaa861d8a5a394
parentb94e7f58ade2bc1de46ee3205dd7151845bc1996
parent3e3b3fd3487ed1f40c3b0ca852ff604cce9417f4
Merge branch 'master' of gitorious.org:gitorious/mainline