Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.com>
Tue, 22 Oct 2013 13:21:33 +0000 (15:21 +0200)
committerChristian Johansen <christian@gitorious.com>
Tue, 22 Oct 2013 13:21:33 +0000 (15:21 +0200)
commit22f2784e03f0d475e1245521355c6f1b3170c33e
tree95c30d3cf3cd8e27536d49b0b1067482c1c5908c
parent1d884991815fea9b11b1776c181b96f50577f68f
parent8584d1603eb1d418faece2c380310fc24c31b415
Merge branch 'master' of gitorious.org:gitorious/mainline

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.