Merge tag 'upstream/0.17'
authorIan Beckwith <ianb@erislabs.net>
Sat, 19 Oct 2013 22:26:45 +0000 (23:26 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 19 Oct 2013 22:26:45 +0000 (23:26 +0100)
commit45804540bec00352912ca8ee3c9d6df1fb9ad32a
treea44bb495ca0c317cdb2aa6abbc8051be6025df03
parent146a8bc26861c6ed0167730b86933ce4ea69254f
parentc5e064206c7bae33b3e105012c47ba1826153a71
Merge tag 'upstream/0.17'

Upstream version 0.17