Merge pull request #115 from marshmellow42/master
commit0f5b97d92cfd4e7a33eb79a226831753812c4ed5
authorMartin Holst Swende <martin@swende.se>
Sun, 14 Jun 2015 07:02:13 +0000 (14 09:02 +0200)
committerMartin Holst Swende <martin@swende.se>
Sun, 14 Jun 2015 07:02:13 +0000 (14 09:02 +0200)
treeb4248f9137b5de603447f0c637eff3e999a84f54
parent01d5b635cfcdce26369860d4353eea8e2cf20539
parent8e2e6c8eb0b762bba6e7cad2d257a219a51390ae
Merge pull request #115 from marshmellow42/master

add-ons and bug fixes