[bitlbee/el6: 2/2] Merge branch 'master' into el6

[Matej Cepl]

commit 36198d1b5fbbbf890707ba07a1d662cb23938fa2
Merge: 39f287e dd77fa0
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Apr 3 10:36:54 2013 +0200

    Merge branch 'master' into el6

 bitlbee.spec               |   10 +++++++++-
 nss-crash-rhbz922447.patch |   20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)
---