commit | cf52f34637e028b600911e25746cfc3431d577c3 | [log] [tgz] |
---|---|---|
author | Dirk Vogt <dirk@fairphone.com> | Wed Dec 23 13:37:01 2015 +0100 |
committer | Dirk Vogt <dirk@fairphone.com> | Wed Dec 23 13:37:01 2015 +0100 |
tree | 88011b29dd87c001304494f513fb91ca4f6050e0 | |
parent | 3a306b246a7dd01468bfce7f67129b7389d8a809 [diff] | |
parent | fa7f6ebd0986698e679a39e3aa1413e76780df57 [diff] |
Merge remote-tracking branch 'origin/fp2-dev-v2' into fp2-sibon-updated