Merge pull request #133 from marshmellow42/master
commit85f011a55047c1249958f61cce69471536429c78
authorMartin Holst Swende <martin@swende.se>
Mon, 20 Jul 2015 22:27:09 +0000 (21 00:27 +0200)
committerMartin Holst Swende <martin@swende.se>
Mon, 20 Jul 2015 22:27:09 +0000 (21 00:27 +0200)
tree94e1f3765106faa403486f9623ac52e8a14404c3
parent86a83668b571d34deec1643eeda3b871cee56b75
parenta40680f3ac163a81d32a7ceb1c54a0b76d0d4b0f
Merge pull request #133 from marshmellow42/master

14b additions + some bug fixes