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

[Lokesh Mandvekar]

commit f0ce7e42df035b39e8b5076248a50be42a073ea9
Merge: 215c06d e4620ed
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Tue Oct 8 16:05:01 2013 -0500

    Merge branch 'master' into f20

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