[golang/epel7: 4/4] Merge branch 'master' into epel7

[Vincent Batts]

commit 07f7084dbcb8592e9ca63743da00ef8ba83078bc
Merge: 8e03a65 7c25ee8
Author: Vincent Batts 
Date:   Wed Oct 1 15:34:28 2014 +0000

Merge branch 'master' into epel7

.gitignore |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---