[openstack-utils/el6: 2/2] Merge branch 'master' into el6

[Pádraig Brady]

commit 400006871a7920c77a5fc478eead51a7888a3c16
Merge: ad2fda5 794f5bc
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Jan 9 15:54:33 2014 +0000

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---