Merge remote-tracking branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sun, 6 Nov 2011 19:57:24 +0000 (15:57 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 6 Nov 2011 19:57:24 +0000 (15:57 -0400)
commitbf8b3bc12abe9d763329a191bdb152b30978d2ef
treee114bc2b1e11c2a972eb06232ab772db36253bd6
parent0550c78a71ff48fb2581e601c8946e70c4340daf
parent64031e30a735969d2cfb6ad93aad87065c0e78d0
Merge remote-tracking branch 'origin/master'