From 7ed6892654562a343ebf31a311a82db715b00eb9 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Tue, 20 Dec 2011 13:53:46 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
(limited to 'browser.py')

--
cgit v0.9.1