Commits in ~shashi/statusnet/shashis-mainline:xampp_fix