Merge pull request #98 from marshmellow42/master
commit2b90e3e670393990a243e1791dccd84acb9526eb
authorMartin Holst Swende <martin@swende.se>
Tue, 28 Apr 2015 21:08:28 +0000 (28 23:08 +0200)
committerMartin Holst Swende <martin@swende.se>
Tue, 28 Apr 2015 21:08:28 +0000 (28 23:08 +0200)
tree59214b9ec6fd2db7ecdf5e0c779a90c3dfbf1d8b
parenta3abb028978d98bf28676d3b4a98083db3b2912a
parentbdfb62b405a3588e4ce72e02c5e6cee7b977efdb
Merge pull request #98 from marshmellow42/master

Iceman's fixes for #93, #96, #97