tree 8503b72526ffd526ef7753d68c57b31906b53ba6
parent 6576b19a28a688f00dbe21318b4073826001cf3c
parent ceb66fd035055e4942d05f483a154039b45f5f22
author Guillaume J. Charmes <guillaume.charmes@dotcloud.com> 1364200149 -0700
committer Guillaume J. Charmes <guillaume.charmes@dotcloud.com> 1364200149 -0700

Merge branch 'master' of github.com:dotcloud/docker