tree 88011b29dd87c001304494f513fb91ca4f6050e0
parent 3a306b246a7dd01468bfce7f67129b7389d8a809
parent fa7f6ebd0986698e679a39e3aa1413e76780df57
author Dirk Vogt <dirk@fairphone.com> 1450874221 +0100
committer Dirk Vogt <dirk@fairphone.com> 1450874221 +0100

Merge remote-tracking branch 'origin/fp2-dev-v2' into fp2-sibon-updated