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

Trivial merge