commit 8830630b30998dfcea4171e6ec1a32ed14c1ad5f Merge: 0fb285c d01eadd Author: Mike Perry <mikeperry-git@torproject.org> Date: Thu Jul 24 21:57:40 2014 -0700 Merge remote-tracking branch 'gk/bug_12680' src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)