Merge branch 'master' of git://gitorious.org/gitorious/mainline
authorBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Thu, 3 Jan 2013 20:51:22 +0000 (12:51 -0800)
committerBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Thu, 3 Jan 2013 20:51:22 +0000 (12:51 -0800)
commit6e38dcf365111daa1a7d8b3736973f30b365257d
tree3294cf2cee6e38e93800f7e29b0005f87f9ade44
parenta5fce32c4dbb867add4b98f92f4ec930fb2f51bb
parent591633040362730312691574f428afa9547edab1
Merge branch 'master' of git://gitorious.org/gitorious/mainline