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)
commitb515e3a04261255e85c6fdd89f089f87350a868f
treea404aa379e0a513b1f05ab2bb7dcde1c9e7d6c5a
parentdbfbc10af43b10fc23e56fa62ef0cde6df71f0e4
parent17c9af3541892b2985bb951e90ca33c5cf77c7e2
Merge branch 'develop' into vanish_notifications