[rubygem-openshift-origin-dns-bind/f18: 2/2] Merge branch 'master' into f18

[tdawson]

commit b522fa74c568db4fb76e63a9e399258d0ebb5696
Merge: 627c21d 5709aea
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Dec 6 11:56:58 2012 -0600

    Merge branch 'master' into f18

 .gitignore                             |    1 +
 rubygem-openshift-origin-dns-bind.spec |   13 ++++++-------
 sources                                |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---