Merge branch 'next', remote-tracking branch 'gitorious/next'
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 27 Dec 2012 10:03:56 +0000 (11:03 +0100)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 27 Dec 2012 10:03:56 +0000 (11:03 +0100)
commitb7cdb5ffc09b1892d7cb23b34bf56980190b3ec4
tree63c692357ca88cec1f5a468649f68b5164843dee
parent06b30e6008dfe6595796638ec6860ff2805889e5
parent61e82d2e9a080da2b3a95aae3f204a5d06580728
Merge branch 'next', remote-tracking branch 'gitorious/next'