Commit de3f851ec49deba7b152c01c53aa329439d1f3f5

Edward Thomson 2014-05-21T09:44:05

Staticify `merge_config`