commit 6dfa9a88bcef910a68cbf2ef541110c53e276934
Merge: a601655 8efa624
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:46:08 2013 -0500
Merge branch 'master' into f20
Conflicts:
golang.spec
golang-f21-hostname.patch | 13 ++++
golang.spec | 147 ++++++++++++++++++++++++++++++--------------
2 files changed, 113 insertions(+), 47 deletions(-)
---