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

[Filipe Rosset]

commit 64da7c596efbb2f856a696c7cc391bbd058a8d84
Merge: d3509fa f55e621
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Mon Feb 24 21:36:50 2014 -0300

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	freeDiameter.spec
    	sources

 .gitignore        |    1 +
 freeDiameter.spec |   16 ++++++++++------
 sources           |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---