Merge remote branch 'smcv/trivia'
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Mar 2010 20:48:47 +0000 (15:48 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Mar 2010 20:48:47 +0000 (15:48 -0500)
commit60fba805e8ecc77e391c8a22db3cdac4adea5756
treea2e0b51e1df6a0e35282f4627335d7ef336787ae
parent02d9445684695f3c1cdc5160bce78b09b764b431
parentb72757b6aecfd2a5d8d3789bc0cdb6fb5783f8fb
Merge remote branch 'smcv/trivia'