[bitlbee/el5: 6/6] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 3b20a556d16a7001808714d31e3d2a078a63079a
Merge: 85273b2 5003895
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Dec 18 22:27:24 2013 +0100

    Merge remote branch 'origin/master' into el5

 .gitignore                 |    1 +
 bitlbee-3.2-libotr4.patch  |    9 +--
 bitlbee-libresolv.patch    |  261 ++++++++++++++++++++++----------------------
 bitlbee.spec               |   33 +++---
 nss-crash-rhbz922447.patch |   20 ----
 sources                    |    2 +-
 6 files changed, 149 insertions(+), 177 deletions(-)
---