Merge remote-tracking branch 'smcv/ready/trail'
authorJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:45:37 +0000 (15:45 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:45:37 +0000 (15:45 -0400)
commitae083783dfdaac05ec6b089771ed159f9246889c
tree1c77e8273ce0859650ceca17dabb3827406dcb3b
parent3b6b0e59b35a65e78f319d15be77e4375587e1b6
parentc1f5a1ccc72c7ac05cf6afe41784f519d2b6c125
Merge remote-tracking branch 'smcv/ready/trail'