Merge branch 'upstream' into doc-orig
authorBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 18:40:35 +0000 (20:40 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 18:40:35 +0000 (20:40 +0200)
commit823f285a03725fe1fc9670cf2cf3ff265e59c67d
treea7d58d9fe25cca6c0728b93b9e8f212022656850
parent3e4016c9d778cbc977c4ccf75fb499a95ee235b7
parent4aa85f09e755fc827cd5ab6225f20c83cd42245d
Merge branch 'upstream' into doc-orig