[resiprocate/el6: 7/7] Merge branch 'f18' into f17

[Daniel Pocock]

commit de34d20ebf10fcabeadc15d94a2346d221b6357e
Merge: b707c9b e492ef3
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Wed Apr 24 19:30:57 2013 +0200

    Merge branch 'f18' into f17
    
    Conflicts:
    	resiprocate.spec

 resiprocate.spec |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)
---