tree f4c0933ce02f2be7f5f2dc174b1024ba1d4eacaf
parent 256f18464db02c91f22b09ded067c968765287fd
parent 5484b546a1fbef170e3f50f15d46a0963f7cfafb
author Zack Williams <zdw@cs.arizona.edu> 1507225811 -0700
committer Gerrit Code Review <gerrit@opencord.org> 1507225811 -0700

Merge "import syncstep, integrate 6094 fixing config error in header.py"