tree 94af74c5eeb9b4aad742101188725942534f5e5c
parent d9e0a0705a186d31db542af662abfdc0a9bd027e
parent 00f2c66d46d9d14611d2455f7a73e6d88f90670b
author Sven Selberg <svense@axis.com> 1472630658 +0200
committer Sven Selberg <svense@axis.com> 1472630901 +0200

Merge stable-2.12

00f2c66 Merge branch stable-2.11 into stable-2.12
6dce1d7 Allow to specify amqp passwords in etc/secure.config
3f65399 Build with API version 2.11.8
ca93bcc Build with plugin API version 2.12.1
5558190 Organize imports
3ed04fb Build with API version 2.11.7
993a2aa Build with plugin API version 2.12 final release

Change-Id: I65c01da0f578af25087144aed5c8b4e374c898af