commit 266dd0d28bbfe6ddc1281f031132825583638168 Merge: 0087524 fb8c3ea Author: Mike Perry mikeperry-git@fscked.org Date: Tue Jul 31 18:01:09 2012 -0700

Merge branch 'maint-2.2' into maint-2.3

build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)