barosltestest/test — pull request #272 by homu (2014-12-21 22:36:27+00:00)
Title: Rollup of 1 pull requests

- Successful merges: #267
- Failed merges: #268, #269