Merge branch 'extension-info'
authorWouter Verhelst <w@uter.be>
Wed, 3 May 2017 22:03:36 +0000 (00:03 +0200)
committerWouter Verhelst <w@uter.be>
Wed, 3 May 2017 22:03:45 +0000 (00:03 +0200)
commitb135246fe046878456b5c71eb93ce313f7e0e7de
tree5adb8a702a93bd5e18ecf3dcee70090f5279ea97
parente6b56c12f8a18e7a7cc253c73d1f63c2cbc41e1b
parent9630e747ac10a9487a31a73375204f538652dd1a
Merge branch 'extension-info'

For real this time, without losing a few commits that were still on top