tree f925220c464c227f15da26379d01f42f2f9b09b0
parent b61f540990d59c8e3973a238d3365e91a95c8eee
parent 6888bc118d3c8bbdde130184b2af8255d8e1bc00
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1396248288 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1396248288 -0700

Merge 'management' branch into master