Merge tag 'upstream/0.19'
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:18 +0000 (02:26 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:18 +0000 (02:26 +0000)
commitc5d4756772d2d08fb6f7609854f236030dc9d571
treebaa03f41fe60a1b016733310f9a146e2ce7a5ac2
parent3eed700a5702bdd74d3f545b9ec58be57cb28e94
parent1d94fcb2781945132b9a29e93744b6c168e647aa
Merge tag 'upstream/0.19'

Upstream version 0.19