[golang-github-docker-libtrust/el6: 3/3] Merge branch 'master' into el6

[Lokesh Mandvekar]

commit 08994564ef5b58bb0d0dcc5cb637a7c51adc2e13
Merge: 30b955b e85274c
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date:   Fri Jan 2 17:39:41 2015 +0000

    Merge branch 'master' into el6
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

 .gitignore                         |    1 +
 golang-github-docker-libtrust.spec |   18 ++++++++++--------
 sources                            |    2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
---