Merge branch 'develop' into improve_notifications_pr_400_with_develop
authormasensio <masensio@solidgear.es>
Fri, 21 Mar 2014 09:37:11 +0000 (10:37 +0100)
committermasensio <masensio@solidgear.es>
Fri, 21 Mar 2014 09:37:11 +0000 (10:37 +0100)

Trivial merge