barosltestest/test — pull request #242 by homu (2014-12-18 10:53:36+00:00)
Title: Rollup of 2 pull requests

- Successful merges: #231, #232
- Failed merges: