commit 596d7f2f9781a01f612c790059d15bc69c258a71 Merge: 2f28b23 7fe5ac8 Author: Ricky Elrod ricky@elrod.me Date: Fri Jan 31 18:58:53 2014 -0500

Merge branch 'master' into epel7

.gitignore | 1 + httpie.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---