[resiprocate/f17: 4/4] Merge branch 'master' into f17

[Daniel Pocock]

commit 7a200bc4ec681eec7e934cd6324f6b8511f3df5b
Merge: de34d20 8cd2233
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Thu Jul 18 16:57:31 2013 +0200

    Merge branch 'master' into f17

 .gitignore       |    1 +
 resiprocate.spec |   12 +++++++-----
 sources          |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---