[auto] Merge from Test
[auto] Merge from Test

    • #e275aba — Lock atoum on ~1.0 (jubianchi, 2014-11-30)
    • #64c57a3 — Re-order requirements. (Ivan Enderlin, 2014-12-01)

---

Merge branch 'master' of /var/lib/git/repositories/Library/Test

Metalaka/Central,Grummfy/Central,vcgato29/Central,Metalaka/Central,Grummfy/Central,vcgato29/Central