Merge branch 'next', remote-tracking branch 'gitorious/next' into next v3-rc1
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Tue, 9 Jul 2013 13:50:33 +0000 (15:50 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Tue, 9 Jul 2013 13:50:33 +0000 (15:50 +0200)
commit8f615e7d1f5d0781b3b33dce4d4f4ef8c5bcb79c
treef154b1ac73eb29cfd2c4084929ec962df66a39a8
parente0ae5fb568fdfe5ec8cdf12d8b7f3ce3b93969c8
parent8c3aa2b672dabab888874f1ae106fc53847b1b18
Merge branch 'next', remote-tracking branch 'gitorious/next' into next