[golang/el6: 3/4] Merge branch 'master' into f20

[Vincent Batts]

commit 9de436f47e4734f483aedc99812a5e270a33ec14
Merge: 6cc32fc 7c25ee8
Author: Vincent Batts 
Date:   Wed Oct 1 15:35:11 2014 +0000

Merge branch 'master' into f20

Conflicts:
    	.gitignore

.gitignore                  |    1 +
 golang.spec                 |   11 ++++-------
 skip_syndey_time_test.patch |   13 -------------
 sources                     |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)
---