[sflphone/f21: 5/10] Merge branch 'master' into f21

[Sandro Mani]

commit 83d40de0b0a2ea8be0cabd56ce2febd95ad72e7d
Merge: 157de15 4c4062e
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Jan 28 13:06:20 2015 +0100

    Merge branch 'master' into f21

 sflphone.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
---