Merge remote-tracking branch 'smcv/trail-test'
authorJoey Hess <joey@kitenet.net>
Mon, 19 Mar 2012 15:19:41 +0000 (11:19 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 19 Mar 2012 15:19:41 +0000 (11:19 -0400)
commit9f2a2879c8225862e993348c133b5a493e74f3e9
treefc69459d9c6f9c2bd13efe3cc122171920be919f
parent20a20f2f27b10dbdbcb875067edef03ad9c163fb
parentc7bc11f26fc4aa8e2a9c7e1bec60076944181b52
Merge remote-tracking branch 'smcv/trail-test'