tree 19a06f11b58d98bc23e8f7d7ad97f319f40349bc
parent 6c6e59418442215e12074d334f1f8a89d8dac688
parent c17b280d460796edcf24bf9a2ebb87a4354653fe
author Matteo Scandolo <teo@onlab.us> 1456945262 -0800
committer Matteo Scandolo <teo@onlab.us> 1456945262 -0800

Resolved conflict in docker ingore