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

[Matej Cepl]

commit 53626fd4f1211f98f3557f03bf0c8cc2cb19be90
Merge: 96001bd 59aa51e
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Nov 28 01:50:15 2013 +0100

    Merge branch 'master' into el6

 .gitignore                |    1 +
 bitlbee-3.2-libotr4.patch |    9 +--------
 bitlbee.spec              |   31 ++++++++++++++++++++++++-------
 sources                   |    2 +-
 4 files changed, 27 insertions(+), 16 deletions(-)
---