Merge tag 'upstream/0.22' master
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:38 +0000 (02:26 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:38 +0000 (02:26 +0000)
commitbf23e788f027c454711a8421b44945acbb2443b8
tree9e55898b91500e417ecef5158e93c968838b8303
parent4a3cf69401f1cdba7219cc23ede458c2615bbd7a
parentfc9466752f05a9a897e009307dc89917562ceda3
Merge tag 'upstream/0.22'

Upstream version 0.22