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

[Lokesh Mandvekar]

commit 59e272acfe327e222b2bc973a362ba0d5962b399
Merge: f0ce7e4 05793d4
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Oct 16 22:41:51 2013 -0500

    Merge branch 'master' into f20

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