tree eccb97ba00ee6276f811225dc6820db138c43f67
parent e9cd3ccc25a34ec1397ffabf094502b772328cc2
author Lars Greiss <kufikugel@googlemail.com> 1406504677 +0200
committer Lars Greiss <kufikugel@googlemail.com> 1406504677 +0200

push for weekly 6.8

Change-Id: I0a5c37d6dd76e061fc34432cdae2641b376e5e25