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

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