Merge pull request #2372 from salzmdan/master
authorHannu Nyman <hannu.nyman@iki.fi>
Fri, 19 Feb 2016 13:46:25 +0000 (15:46 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Fri, 19 Feb 2016 13:46:25 +0000 (15:46 +0200)
knot: update to 2.1.1


Trivial merge