Merge branch 'develop' into vanish_notifications
authormasensio <masensio@solidgear.es>
Fri, 30 May 2014 10:55:02 +0000 (12:55 +0200)
committermasensio <masensio@solidgear.es>
Fri, 30 May 2014 10:55:02 +0000 (12:55 +0200)

Trivial merge