[28311] in Source-Commits
firefox-extension commit [debian]: Merge branch 'master' into debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jul 6 13:21:48 2014
Date: Sun, 6 Jul 2014 13:21:41 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407061721.s66HLe64023914@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/firefox-extension/commit/b44e6a6282a30adf46934aed32584058967c1b7e
commit b44e6a6282a30adf46934aed32584058967c1b7e
Merge: 83e6a55 a705862
Author: Jonathan Reed <jdreed@mit.edu>
Date: Fri Jun 20 10:47:32 2014 -0400
Merge branch 'master' into debian
VERSION | 2 +-
defaults/preferences/athena.js | 7 -------
install.rdf | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)