Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 11 Oct 2012 12:07:10 +0000 (14:07 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 11 Oct 2012 12:07:10 +0000 (14:07 +0200)
commit83f9566a726afd7260ef317ca7119b5c4e71d31f
tree0fe70c345cceef5e2208cb2fd7f5d5b6c5fcfe72
parentbec4d0d594604e211edc58362350ead6fa8e96c1
parent3fd4b9aaa3a1aa1ebf749eb14d025522d13e3ee1
Merge branch 'master' of gitorious.org:gitorious/mainline