Merge pull request #7668 from docker/merge_release_v1.2.0

Merge release v1.2.0
This commit is contained in:
Victor Vieux 2014-08-22 11:18:48 -05:00
commit 93af45daab

Diff content is not available