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

[Matej Cepl]

commit bc6665e86dce44b7cef564bee017f054fe884969
Merge: b16afbb dd77fa0
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Apr 3 10:34:58 2013 +0200

    Merge branch 'master' into el5

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