manually merge pull requests #237

Merged
Atheros1 merged 2 commits from master into master 2013-06-20 22:42:52 +02:00

2 Commits

Author SHA1 Message Date
Jonathan Warren
936369da0a manual implement Github issue #223 2013-06-20 16:41:14 -04:00
Jonathan Warren
a6c9ff288e manuall merge github issue #229 2013-06-20 16:04:50 -04:00