[tigase-server/el6/master: 7/7] Merge branch 'master' into el6

[Matej Cepl]

commit a0e92ef326b64f21dfe0ab418f21ba9483f701c8
Merge: e16ac23 debe338
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Oct 20 12:09:59 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	tigase-server.spec

 .gitignore         |    2 ++
 sources            |    2 +-
 tigase-server.spec |   15 ++++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)
---