tree 9a7f1fd8c0b15c6e099fc662ece002c6bf309f21
parent 3e223c2a7ab1589f3f7091667357be59f88dae1e
parent 3dc0503f69767b727a912c7ef9b19f14e9ead05a
author Dirk Vogt <dirk@fairphone.com> 1463136585 +0200
committer Dirk Vogt <dirk@fairphone.com> 1463136585 +0200

Merge remote-tracking branch 'origin/fp/fp2_5.1_int' into fp2-sibon-staging-16.05.00.1