Merge remote-tracking branch 'bremner/master'
authorJoey Hess <joey@kitenet.net>
Fri, 15 Aug 2014 16:54:30 +0000 (12:54 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 15 Aug 2014 16:54:30 +0000 (12:54 -0400)
commita05eca45457efe7c31884a1b3c14ef2ff505f1d8
tree63a4cee0b43708fda218f57fb08e1af3a0ecdece
parentbe392bc0607510cd7c3a9a9a0c0395fdfa77f92b
parentadbc9cb8d6a6001bd63da7e68ebc31b71e522225
Merge remote-tracking branch 'bremner/master'