Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 14 Jul 2016 18:52:18 +0000 (20:52 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 14 Jul 2016 18:52:18 +0000 (20:52 +0200)
commitaba0a5ebb8a7c606e988bbbb01c7875447d23ebe
tree9403a64412ab5b69ca06ca8c64cc07afb7778025
parentff6b404f001a0460252a29051bc34c07c91e4cf1
parentbc69b3a5838017da2b48302096cb6b152fa1f37e
Merge remote-tracking branch 'upstream/master'
README.md
setup.py
utils/vagrant/motd