[bitlbee/f13/master: 45/45] Merge branch 'f12' into f13

Mon Nov 22 18:06:48 UTC 2010

commit 8b60a3eb672e74cde79b3d11580fc3d4ee9e85a2
Merge: 0cc65cd 68d1241
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Nov 22 19:06:32 2010 +0100

    Merge branch 'f12' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                      |    1 -
 bitlbee-1.2.8-strtoll.patch     |   23 --
 bitlbee-configure-eclipse.patch |   15 ++
 bitlbee-installP.patch          |   48 +++++
 bitlbee-libresolv.patch         |  440 +++++++++++++++++++++++++++++++++++++++
 bitlbee-nss.patch               |  170 +++++++++++++++
 bitlbee-syslibdirs.patch        |   12 +
 bitlbee.spec                    |   34 ++--
 8 files changed, 703 insertions(+), 40 deletions(-)
---