tree af745f15e26948a9c4c3f3d0e8c508a692a74c64
parent b608ade680248cba4a6e8a148a5dac4e7b0056b1
parent 9c1bab23f5b53f0bca44bc1bb1e5e0e0f4161d80
author Matt Post <post@cs.jhu.edu> 1423078719 -0500
committer Matt Post <post@cs.jhu.edu> 1423078719 -0500

Merge branch '6.0'

Conflicts:
	6.0/faq.md