[kbruch/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 30419bcefd48aefafce74c855d654500724c9d7c
Merge: 3ccb53f bb7a2af
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:57:04 2012 -0500

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 kbruch.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---