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

Trivial merge