Merge "Revert "Enable merge of the versions struct of a plugin""
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Tue, 15 Mar 2016 19:22:22 +0000 (19:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 15 Mar 2016 19:22:22 +0000 (19:22 +0000)
commitbf2a65a28572c90484d0c5668274485721d0f1c7
treeb309120ca49d2e8502596563dfcfc981b7da7902
parent7e55696b3d16dbc6b45fba7a20e6145089a040a8
parent552536f5319d6ead73118d0cfd701d648e99df28
Merge "Revert "Enable merge of the versions struct of a plugin""