Merge tag 'upstream/0.18'
authorIan Beckwith <ianb@erislabs.net>
Thu, 23 Jan 2014 22:59:49 +0000 (22:59 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 23 Jan 2014 22:59:49 +0000 (22:59 +0000)
commit142608d2df1288332140ed21c03b383cd6eed66f
tree618cb5448c429b00d04159c080ce5a3a5fdab0cb
parent2735b4934490be5b68970c88fb5652e983ed5d5d
parent5ea1ac36de0445293009b06d3a28620e63f92916
Merge tag 'upstream/0.18'

Upstream version 0.18