Azure/azure-content — pull request #2002 by cjgronlund (2014-08-25 22:24:04+00:00)
Title: Fixing merge conflict

Fixing merge conflict with: https://github.com/Azure/azure-content/pull/1987