tree 1fd1b7e9e9345e4409d4685a145ab87dd1d02a4a
parent b885e4fba3245f555cf5deac58c65084d2692703
parent 6564e708ae6ce474d83e66b0c493fdd96e11c76d
author Matteo Scandolo <teo@onlab.us> 1449697652 -0800
committer Matteo Scandolo <teo@onlab.us> 1449697652 -0800

Resolved conflict in devel Makefile