[freeDiameter/f19: 5/5] Merge branch 'master' into f19

[Filipe Rosset]

commit 32659701f1d6702abd80f93d77e19c3f91a70cc3
Merge: 64da7c5 0dd0bc4
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Sun Aug 31 18:11:15 2014 -0300

    Merge branch 'master' into f19

 freeDiameter.spec |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---