[sflphone/f20: 9/9] Merge branch 'master' into f20

[Sandro Mani]

commit 0c556e342d122a199881528929a8fb0a832de828
Merge: 157de15 48373f7
Author: Sandro Mani <manisandro at gmail.com>
Date:   Sun Mar 8 00:42:25 2015 +0100

    Merge branch 'master' into f20

 sflphone.spec                  | 23 ++++++++++++++++++++---
 sflphone_gcc5.patch            | 23 +++++++++++++++++++++++
 sflphone_macro-collision.patch | 11 +++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)
---