loldevs/riotapi — pull request #7 by Boreeas (2014-08-06 09:13:42+00:00)
Title: Merge unstable back into master

Since the rtmp tests are passing now, I'm merging unstable into master