[elixir/f21: 3/3] Merge branch 'master' into f21

[Ricky Elrod]

commit ce0901efb134706642eb026966ef7d49a8a4ec09
Merge: 1d9c2b4 e6e0660
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Oct 8 16:01:45 2014 -0400

    Merge branch 'master' into f21

 .gitignore  |    1 +
 elixir.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---