Merge branch 'master' of https://github.com/vanrein/quick-der
authorRick van Rein <rick@openfortress.nl>
Sat, 12 Mar 2016 23:58:37 +0000 (23:58 +0000)
committerRick van Rein <rick@openfortress.nl>
Sat, 12 Mar 2016 23:58:37 +0000 (23:58 +0000)

Trivial merge