[golang-github-gorilla-context/el6: 2/2] Merge branch 'master' into el6

[Lokesh Mandvekar]

commit 5abefd49eec53e6d43f19e060af93d503f7ee8b7
Merge: 004693e 05793d4
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Oct 16 23:01:59 2013 -0500

    Merge branch 'master' into el6

 golang-github-gorilla-context.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---