Merge branch 'develop' into vanish_notifications
authormasensio <masensio@solidgear.es>
Thu, 29 May 2014 07:22:16 +0000 (09:22 +0200)
committermasensio <masensio@solidgear.es>
Thu, 29 May 2014 07:22:16 +0000 (09:22 +0200)

Trivial merge