Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.com>
Wed, 16 Oct 2013 12:00:51 +0000 (14:00 +0200)
committerChristian Johansen <christian@gitorious.com>
Wed, 16 Oct 2013 12:00:51 +0000 (14:00 +0200)
commitf0c2f81986be48ae1bf47a5f3c4f4611e0f6a970
tree412025a051a70b927601f6cc7063e1b9611094f3
parentd413ef4b1b686fc70efd752b99f8408d48e280bc
parent2ffcdd77403b766a52e0bb011f285d6fc46ab5cc
Merge branch 'master' of gitorious.org:gitorious/mainline