From 781c9561b9388713e0fd32a350e4b36027849d29 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Tue, 29 Nov 2011 10:07:03 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

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

--
cgit v0.9.1