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

- Successful merges: #189, #190
- Failed merges: