[up-imapproxy/el6: 6/6] Merge branch 'f15' into el6

[Jan-Frode Myklebust]

commit 0ef89e4597b774a94fb2597a1427a2aad0461994
Merge: 09505f2 61dfd56
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Thu Aug 18 09:27:46 2011 +0200

    Merge branch 'f15' into el6
    
    Conflicts:
    	.gitignore

 .gitignore        |    3 ++-
 sources           |    2 +-
 up-imapproxy.spec |   17 +++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)
---