Merge tag 'upstream/0.17'
authorIan Beckwith <ianb@erislabs.net>
Sat, 8 Jun 2013 14:28:00 +0000 (15:28 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 8 Jun 2013 14:28:00 +0000 (15:28 +0100)
commite8034964e59d326a3c039ce5cd462ef429da70ac
treeba44d7c74b85962ac494e601d6c9da24b7ff2b50
parent9972ae836ae61cac5664edbe90680b31861aab80
parente021488790d05654b6a8f5e13896b29aad7da610
Merge tag 'upstream/0.17'

Upstream version 0.17