Merge branch 'master' into schedule-generator
authorrsiddharth <rsd@gnu.org>
Fri, 29 Jan 2016 01:30:52 +0000 (20:30 -0500)
committerrsiddharth <rsd@gnu.org>
Fri, 29 Jan 2016 01:30:52 +0000 (20:30 -0500)

Trivial merge