Merge branch 'master' of git://gitorious.org/gitorious/mainline master
authorBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Sat, 13 Jul 2013 00:19:26 +0000 (17:19 -0700)
committerBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Sat, 13 Jul 2013 00:19:26 +0000 (17:19 -0700)
commitcb8d71299b07295ac9542f9ef14be042c81878ab
treec3661f7dd072ab74812899f6330b91d93010d185
parent9357d037164537a86fff1cf4548e5a319f8a82dd
parentc1105ebe86b1fe28a3dfa336ffa1b513a7054cf4
Merge branch 'master' of git://gitorious.org/gitorious/mainline