commit 3993b0dcc95211c216f8ac5643acf3405dc7a6d7 Merge: 75b3630 633dd7f Author: Mike Perry mikeperry-git@fscked.org Date: Fri Jun 14 22:10:47 2013 -0700

Merge branch 'maint-2.4'

build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)