Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 21 May 2015 19:12:44 +0000 (21:12 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 21 May 2015 19:12:44 +0000 (21:12 +0200)

No differences found