tree 82d1ae89fa6386eeba67611bc70a4abda13bb146
parent 2efa55f28aecb5b9c0f9d0952276cd080f2cf32e
parent 2dc84aa0ecaa13a63c627da5ebd8d3ed3674a4ca
author Dirk Vogt <dirk@fairphone.com> 1465386755 +0200
committer Dirk Vogt <dirk@fairphone.com> 1465386755 +0200

Merge remote-tracking branch 'origin/fp/fp2_5.1_int'