tree 8380f9cd6bbf1b7c5c6fd1e1b60972e20bf9a2d2
parent ec510bcccd59407bf7d15b52ce0e90882cb62632
parent 5247e265e8474ea3851651efebefcb5b80fb837e
author Matteo Scandolo <matteo.scandolo@gmail.com> 1465866656 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> 1465866656 -0700

Merge branch 'master' of github.com:open-cloud/xos