[znc-infobot/f16: 2/2] Merge branch 'master' into f16

[Nick Bebout]

commit 8f7efe9480d28996c933b24fb23969aea431ca3c
Merge: a6f91ab 0e044ab
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 18 20:26:18 2011 -0500

    Merge branch 'master' into f16

 znc-infobot.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---