Merge "Rebase of ks.cfg due to upstream changes" into stable/brahmaputra
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Fri, 29 Jan 2016 13:31:22 +0000 (13:31 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 13:31:23 +0000 (13:31 +0000)
commite3fcd2b56a5e7d3e75b37e7e8e10795dd56cb4b3
tree54c1b7a86916367ddcb14448d96f9c290d941510
parent53bf12e7ee42e89a1c73665e5955cb9ce403614c
parent3cfef23cdc7fca8ddb2e2f190f01f6bc145d56d6
Merge "Rebase of ks.cfg due to upstream changes" into stable/brahmaputra