[28142] in Source-Commits
locker-support commit [debian]: Merge branch 'master' into debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Apr 4 13:08:16 2014
Date: Fri, 4 Apr 2014 13:08:07 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201404041708.s34H87tE012910@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/locker-support/commit/eb1048d42aa8c4988fbc5ef8737b98140c304bf1
commit eb1048d42aa8c4988fbc5ef8737b98140c304bf1
Merge: 61110a0 285c7c2
Author: Jonathan Reed <jdreed@mit.edu>
Date: Fri Apr 4 08:19:48 2014 -0400
Merge branch 'master' into debian
athdir | 11 +++++++----
setup.py | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
