tree a0995ae753b45766e80170e72181a7652b6f575e
parent 5fc82c33d318e447b18b86e1ddcf65d782bc2e71
parent 488e038ca0d30919f8499de0942a9fed8283cf9c
author Matteo Scandolo <teo@onlab.us> 1456945262 -0800
committer Matteo Scandolo <teo@onlab.us> 1456945262 -0800

Resolved conflict in docker ingore