Merge branch '7454-azure-custom-data' closes #7454
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Dec 2015 15:29:51 +0000 (10:29 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Dec 2015 15:29:51 +0000 (10:29 -0500)

Trivial merge