0000000000000000000000000000000000000000 a21b8ec3461767d464b4953415f7bc639af1a130 Joey Hess <joey@kitenet.net> 1382050730 +0100	clone: from git://git-annex.branchable.com/
a21b8ec3461767d464b4953415f7bc639af1a130 36ebf864691645bd80e33320210a02a0df3ef23c Joey Hess <joey@kitenet.net> 1382064039 +0100	pull: Fast-forward
36ebf864691645bd80e33320210a02a0df3ef23c 063230d4709005d4a26727daf3cbff7655bba34f Joey Hess <joey@kitenet.net> 1384102352 +0000	pull: Fast-forward
063230d4709005d4a26727daf3cbff7655bba34f 74a7ca816d3dc62796523a60bcca234205ae1720 Joey Hess <joey@kitenet.net> 1384122116 +0000	pull: Fast-forward
74a7ca816d3dc62796523a60bcca234205ae1720 2f1af6987891f17726f703e6c245ac5b33281fdb Joey Hess <joey@kitenet.net> 1384185054 +0000	pull: Fast-forward
2f1af6987891f17726f703e6c245ac5b33281fdb 4efc744634a0956881a7e96e854a975950a7a042 Joey Hess <joey@kitenet.net> 1384227344 +0000	pull: Fast-forward
4efc744634a0956881a7e96e854a975950a7a042 3268f0395fbfb20d0dc38bf4a90773fbd0ed0916 Joey Hess <joey@kitenet.net> 1384788794 +0000	pull: Fast-forward
3268f0395fbfb20d0dc38bf4a90773fbd0ed0916 60751a4d5d269da6d60f54bc45c5461b344ed2c5 Joey Hess <joey@kitenet.net> 1384788823 +0000	checkout: moving from master to debian-wheezy-backport
60751a4d5d269da6d60f54bc45c5461b344ed2c5 1f298f84cf54e4704aa6ec8626b48aa56de775c7 Joey Hess <joey@kitenet.net> 1384789413 +0000	commit: prep backport
1f298f84cf54e4704aa6ec8626b48aa56de775c7 3268f0395fbfb20d0dc38bf4a90773fbd0ed0916 Joey Hess <joey@kitenet.net> 1385406097 +0000	checkout: moving from debian-wheezy-backport to master
3268f0395fbfb20d0dc38bf4a90773fbd0ed0916 215fe3c02861d2c15691976bbb4cc20f7c390f69 Joey Hess <joey@kitenet.net> 1385406100 +0000	pull: Fast-forward
215fe3c02861d2c15691976bbb4cc20f7c390f69 04f220fd8111e4328b9cf1a7c8ac40e970d5610b Joey Hess <joey@kitenet.net> 1385487934 +0000	pull: Fast-forward
04f220fd8111e4328b9cf1a7c8ac40e970d5610b b1036ab37577db22842c55868583a75923c7a61a Joey Hess <joey@kitenet.net> 1385488100 +0000	pull: Fast-forward
b1036ab37577db22842c55868583a75923c7a61a 857548e1b771f8516b33f84aca437cabcaeba75d Joey Hess <joey@kitenet.net> 1385493587 +0000	commit: fix gnutls
857548e1b771f8516b33f84aca437cabcaeba75d 516b61df14e924ee7916518173246e125a882fcf Joey Hess <joey@kitenet.net> 1385493682 +0000	commit: avoid excesive cabal configure when rebuilding android
516b61df14e924ee7916518173246e125a882fcf ed09d2d73e4dce01a333a914ec8b5fdd89aefa19 Joey Hess <joey@kitenet.net> 1385493736 +0000	commit: enable XMPP on android
ed09d2d73e4dce01a333a914ec8b5fdd89aefa19 9df032c809a0e0f0860318bb0c75500d00706383 Joey Hess <joey@kitenet.net> 1386090962 +0000	pull: Fast-forward
9df032c809a0e0f0860318bb0c75500d00706383 3be32d240bbf9149b18f0f9b7eb4849154a2bd11 Joey Hess <joey@kitenet.net> 1386091003 +0000	pull: Fast-forward
3be32d240bbf9149b18f0f9b7eb4849154a2bd11 07252d65acd93842e19e59adb3882c836a687969 Joey Hess <joey@kitenet.net> 1387258337 +0000	pull: Fast-forward
07252d65acd93842e19e59adb3882c836a687969 fcf63843897abb5c3dec106c2701db192d5194f7 Joey Hess <joey@kitenet.net> 1387346886 +0000	pull: Fast-forward
fcf63843897abb5c3dec106c2701db192d5194f7 0027cef39503e1a9abc0dac8fbc662d9e82634cf Joey Hess <joey@kitenet.net> 1387402749 +0000	commit: improve EvilSplicer robustness
0027cef39503e1a9abc0dac8fbc662d9e82634cf ccef06da4103434345a02968a4c1140e0cd7e9c6 Joey Hess <joey@kitenet.net> 1387402877 +0000	commit: allow building webapp with EvilSplicer for non-android arm
ccef06da4103434345a02968a4c1140e0cd7e9c6 e3a71c006a3682852d754d1792b075f6017992b3 Joey Hess <joey@kitenet.net> 1388352707 +0000	pull: Fast-forward
e3a71c006a3682852d754d1792b075f6017992b3 8d3dc1bfbc1c3987192b6ae101b53de7993f261a Joey Hess <joey@kitenet.net> 1388364079 +0000	commit: disable NODELAY on android
8d3dc1bfbc1c3987192b6ae101b53de7993f261a 8b2bbc7481d947ff1e857dad378183b0c1ed0ab4 Joey Hess <joey@kitenet.net> 1390573266 +0000	pull: Fast-forward
8b2bbc7481d947ff1e857dad378183b0c1ed0ab4 1f298f84cf54e4704aa6ec8626b48aa56de775c7 Joey Hess <joey@kitenet.net> 1390573292 +0000	checkout: moving from master to debian-wheezy-backport
1f298f84cf54e4704aa6ec8626b48aa56de775c7 d649b14b89e9e84fecc9f57420788fb088dd7e76 Joey Hess <joey@kitenet.net> 1390573299 +0000	merge remotes/origin/debian-wheezy-backport: Fast-forward
d649b14b89e9e84fecc9f57420788fb088dd7e76 8a651bafd2ebe4cf1143c6d434931e7135786a8b Joey Hess <joey@kitenet.net> 1390573473 +0000	commit (merge): Merge tag 'debian/5.20140117' into debian-wheezy-backport
8a651bafd2ebe4cf1143c6d434931e7135786a8b 7ff8ab24ee43d71c7564575e3435c64a01cb8e3a Joey Hess <joey@kitenet.net> 1390573523 +0000	commit: prep backport
7ff8ab24ee43d71c7564575e3435c64a01cb8e3a dfa8b12b1cd6a91b809dbf0b75640ee6ac4e58df Joey Hess <joey@kitenet.net> 1390574258 +0000	commit: tasty is not in stable
dfa8b12b1cd6a91b809dbf0b75640ee6ac4e58df 4736644525026ae725da15804474289799f45f83 Joey Hess <joey@kitenet.net> 1390576268 +0000	merge refs/remotes/dgit/dgit/wheezy-backports: Merge made by the 'ours' strategy.
4736644525026ae725da15804474289799f45f83 8b2bbc7481d947ff1e857dad378183b0c1ed0ab4 Joey Hess <joey@kitenet.net> 1390578609 +0000	checkout: moving from debian-wheezy-backport to master
8b2bbc7481d947ff1e857dad378183b0c1ed0ab4 4736644525026ae725da15804474289799f45f83 Joey Hess <joey@kitenet.net> 1391104346 +0000	checkout: moving from master to debian-wheezy-backport
4736644525026ae725da15804474289799f45f83 82bedf1d3fc101fbda1ff6df9eb3bbf1f0177197 Joey Hess <joey@kitenet.net> 1391104355 +0000	pull: Fast-forward
82bedf1d3fc101fbda1ff6df9eb3bbf1f0177197 41ae37ea1dba9ea7c6907017ea7f0cbfba40a267 Joey Hess <joey@kitenet.net> 1391104431 +0000	pull: Fast-forward
41ae37ea1dba9ea7c6907017ea7f0cbfba40a267 8b2bbc7481d947ff1e857dad378183b0c1ed0ab4 Joey Hess <joey@kitenet.net> 1391106868 +0000	checkout: moving from debian-wheezy-backport to master
8b2bbc7481d947ff1e857dad378183b0c1ed0ab4 e0c4b5299623d2b83322fb971ed5b69656d53d13 Joey Hess <joey@kitenet.net> 1391798970 +0000	pull: Fast-forward
e0c4b5299623d2b83322fb971ed5b69656d53d13 590adeb2a79f3f59769288794bd11adf9981a89e Joey Hess <joey@kitenet.net> 1391799179 +0000	pull: Fast-forward
590adeb2a79f3f59769288794bd11adf9981a89e 48d9a0b3bbf87cf2adc727025bcdab9405a035e4 Joey Hess <joey@kitenet.net> 1391880341 +0000	merge chroot/master: Fast-forward
48d9a0b3bbf87cf2adc727025bcdab9405a035e4 270e0da9e5c30e91e02643241fa564e1a9610f00 Joey Hess <joey@kitenet.net> 1391883305 +0000	pull: Merge made by the 'recursive' strategy.
270e0da9e5c30e91e02643241fa564e1a9610f00 f271d86ef6835e335afd15c0bceac77635c54883 Joey Hess <joey@kitenet.net> 1392087051 +0000	commit: add android patch for x509-system cert store
f271d86ef6835e335afd15c0bceac77635c54883 8101b964b702caeea46068ec2b75216dab72496e Joey Hess <joey@kitenet.net> 1392095972 +0000	pull: Fast-forward
8101b964b702caeea46068ec2b75216dab72496e d51d0a344fa4b552ce52523b53653f44f7b04ebb Joey Hess <joey@kitenet.net> 1392936582 +0000	pull: Fast-forward
d51d0a344fa4b552ce52523b53653f44f7b04ebb 41ae37ea1dba9ea7c6907017ea7f0cbfba40a267 Joey Hess <joey@kitenet.net> 1392936626 +0000	checkout: moving from master to debian-wheezy-backport
41ae37ea1dba9ea7c6907017ea7f0cbfba40a267 f78b81f4633086b98ec7fb070674a4f6ab956a87 Joey Hess <joey@kitenet.net> 1392936913 +0000	commit (merge): Merge tag '5.20140210' into debian-wheezy-backport
f78b81f4633086b98ec7fb070674a4f6ab956a87 68003c78c8e17693abdbbc35b5ee241700a1e3e3 Joey Hess <joey@kitenet.net> 1392937222 +0000	commit: changelog
68003c78c8e17693abdbbc35b5ee241700a1e3e3 d51d0a344fa4b552ce52523b53653f44f7b04ebb Joey Hess <joey@kitenet.net> 1394042560 +0000	checkout: moving from debian-wheezy-backport to master
d51d0a344fa4b552ce52523b53653f44f7b04ebb 92aadb2865fe99395dcdeee850dfdf2988a8abb7 Joey Hess <joey@kitenet.net> 1394173383 +0000	commit: refreshed patches
92aadb2865fe99395dcdeee850dfdf2988a8abb7 35aa0550395c3c292f4da8d6897cb4d372fd018f Joey Hess <joey@kitenet.net> 1394472666 +0000	pull: Fast-forward
35aa0550395c3c292f4da8d6897cb4d372fd018f f7cd43cfd0001a67c40ab0b18a4ab86ab569f302 Joey Hess <joey@kitenet.net> 1394472693 +0000	pull: Fast-forward
f7cd43cfd0001a67c40ab0b18a4ab86ab569f302 493c24b886f58c3ff1e74c04e8a96adf192ed713 Joey Hess <joey@kitenet.net> 1394474031 +0000	pull: Fast-forward
493c24b886f58c3ff1e74c04e8a96adf192ed713 dde810217b4e54c7628e86cb22c1156cfda99c95 Joey Hess <joey@kitenet.net> 1394639498 -0400	pull: Fast-forward
dde810217b4e54c7628e86cb22c1156cfda99c95 68003c78c8e17693abdbbc35b5ee241700a1e3e3 Joey Hess <joey@kitenet.net> 1394639589 -0400	checkout: moving from master to debian-wheezy-backport
68003c78c8e17693abdbbc35b5ee241700a1e3e3 fb5d12ab9238d83e5c3e224881fe0faf49a06126 Joey Hess <joey@kitenet.net> 1394639831 -0400	commit (merge): Updating backport to newest release.
fb5d12ab9238d83e5c3e224881fe0faf49a06126 dde810217b4e54c7628e86cb22c1156cfda99c95 Joey Hess <joey@kitenet.net> 1394641511 -0400	checkout: moving from debian-wheezy-backport to master
dde810217b4e54c7628e86cb22c1156cfda99c95 2b75beaf4f17190cf842583f498290c8fcd25768 Joey Hess <joey@kitenet.net> 1394641532 -0400	commit: got tasty-rerun working on android
2b75beaf4f17190cf842583f498290c8fcd25768 91c5955babc75d0abe6fb48081e2bf5c3aaf9e0d Joey Hess <joey@kitenet.net> 1394641549 -0400	pull: Merge made by the 'recursive' strategy.
91c5955babc75d0abe6fb48081e2bf5c3aaf9e0d fb5d12ab9238d83e5c3e224881fe0faf49a06126 Joey Hess <joey@kitenet.net> 1394641553 -0400	checkout: moving from master to debian-wheezy-backport
fb5d12ab9238d83e5c3e224881fe0faf49a06126 40634fb683a8a43ebdff482e44a200223389eb13 Joey Hess <joey@kitenet.net> 1394641568 -0400	cherry-pick: quick fix to build with old warp-tls
40634fb683a8a43ebdff482e44a200223389eb13 b5a9d8e81cc7daf8ce12dabb75ab39b05432f05b Joey Hess <joey@kitenet.net> 1394641594 -0400	commit: warp-tls disable
b5a9d8e81cc7daf8ce12dabb75ab39b05432f05b 3961bcf486ebb496cc9a617d8cd8ebfbdde6256a Joey Hess <joey@kitenet.net> 1394642029 -0400	cherry-pick: another old warp-tls workaround
3961bcf486ebb496cc9a617d8cd8ebfbdde6256a b5696ab8d49ec10b451c1b043d97c11eac7d733c Joey Hess <joey@kitenet.net> 1394642796 -0400	merge refs/remotes/dgit/dgit/wheezy-backports: Merge made by the 'ours' strategy.
b5696ab8d49ec10b451c1b043d97c11eac7d733c d41971b96094484b621a2d28327b8bd8128b6d36 Joey Hess <joey@kitenet.net> 1395861256 -0400	commit (merge): Merge tag '5.20140320' into debian-wheezy-backport
d41971b96094484b621a2d28327b8bd8128b6d36 50231370f83571105d6e365312922cc60baf53f1 Joey Hess <joey@kitenet.net> 1395861300 -0400	commit (amend): Merge tag '5.20140320' into debian-wheezy-backport
50231370f83571105d6e365312922cc60baf53f1 a20b9d78dc5aa77aec077f424f68bd50a4757d29 Joey Hess <joey@kitenet.net> 1395861345 -0400	commit (amend): Merge tag '5.20140320' into debian-wheezy-backport
a20b9d78dc5aa77aec077f424f68bd50a4757d29 dcd71ace664aa10964a8c592e84f1ce9018acb23 Joey Hess <joey@kitenet.net> 1395861427 -0400	commit: changelog for backport
dcd71ace664aa10964a8c592e84f1ce9018acb23 e2c21d656f9962d751a1c4e507ed0dc9ce4533d7 Joey Hess <joey@kitenet.net> 1395861510 -0400	commit: revert use of haskell-dns for backport
e2c21d656f9962d751a1c4e507ed0dc9ce4533d7 f2fa9ecdce2ea42dc210e831d69142c3aa3d543e Joey Hess <joey@kitenet.net> 1395861886 -0400	commit: backport built w/o securemem
f2fa9ecdce2ea42dc210e831d69142c3aa3d543e 3c530c4e7176909172057f66425eb2a1dc8aa34e Joey Hess <joey@kitenet.net> 1395862090 -0400	commit (amend): backport built w/o securemem
3c530c4e7176909172057f66425eb2a1dc8aa34e 91c5955babc75d0abe6fb48081e2bf5c3aaf9e0d Joey Hess <joey@kitenet.net> 1396472767 -0400	checkout: moving from debian-wheezy-backport to master
91c5955babc75d0abe6fb48081e2bf5c3aaf9e0d e0078c3882df4e6d746d21ad94ddc0d7c12e7d78 Joey Hess <joey@kitenet.net> 1396478790 -0400	pull: Merge made by the 'recursive' strategy.
e0078c3882df4e6d746d21ad94ddc0d7c12e7d78 8729abc744421d473799d35720e11292bd7e7b2d Joey Hess <joey@kitenet.net> 1396735528 -0400	pull: Fast-forward
8729abc744421d473799d35720e11292bd7e7b2d a1548c663a5793ad4a7a81c8e7ef7aff23e7eab8 Joey Hess <joey@kitenet.net> 1396736874 -0400	merge refs/remotes/dgit/dgit/sid: Merge made by the 'ours' strategy.
a1548c663a5793ad4a7a81c8e7ef7aff23e7eab8 2503f433dc2897bff627e7af25f9554a494f1491 Joey Hess <joey@kitenet.net> 1397254348 -0400	pull: Fast-forward
2503f433dc2897bff627e7af25f9554a494f1491 c26bc0423eac3ec825ccf90d79deaa6c8f7c4d58 Joey Hess <joey@kitenet.net> 1397494491 -0400	pull: Fast-forward
c26bc0423eac3ec825ccf90d79deaa6c8f7c4d58 3c530c4e7176909172057f66425eb2a1dc8aa34e Joey Hess <joey@kitenet.net> 1397494501 -0400	checkout: moving from master to debian-wheezy-backport
3c530c4e7176909172057f66425eb2a1dc8aa34e 1a425b9c9080e8769a8d0c529f5ab4582596a3c5 Joey Hess <joey@kitenet.net> 1397494568 -0400	merge 5.20140412: Merge made by the 'recursive' strategy.
1a425b9c9080e8769a8d0c529f5ab4582596a3c5 7e6203366f4a6f38f082781e2f64608b5fbee0b5 Joey Hess <joey@kitenet.net> 1397496432 -0400	cherry-pick: add missing Network.URI Ord instance for Debian stable
7e6203366f4a6f38f082781e2f64608b5fbee0b5 3b4f8c17849aa8f92ab7fb3bf583b1334871e550 Joey Hess <joey@kitenet.net> 1397497075 -0400	cherry-pick: adjust to not use cpp in modules used by configure
3b4f8c17849aa8f92ab7fb3bf583b1334871e550 997c7a5d6e5af65ce3a9397655220a3b0bc16c35 Joey Hess <joey@kitenet.net> 1398055127 -0400	cherry-pick: allow building with old feed lib, w/o pubdate
997c7a5d6e5af65ce3a9397655220a3b0bc16c35 b1207db461b0897e4cb4d6b83ce3804f35665f72 Joey Hess <joey@kitenet.net> 1400273458 -0400	merge 5.20140421: Merge made by the 'recursive' strategy.
b1207db461b0897e4cb4d6b83ce3804f35665f72 c26bc0423eac3ec825ccf90d79deaa6c8f7c4d58 Joey Hess <joey@kitenet.net> 1400273498 -0400	checkout: moving from debian-wheezy-backport to master
c26bc0423eac3ec825ccf90d79deaa6c8f7c4d58 b1207db461b0897e4cb4d6b83ce3804f35665f72 Joey Hess <joey@kitenet.net> 1400273513 -0400	checkout: moving from master to debian-wheezy-backport
b1207db461b0897e4cb4d6b83ce3804f35665f72 9072088174c4ae955b69575175c5dc50b4946860 Joey Hess <joey@kitenet.net> 1400273923 -0400	commit: backport changelog
9072088174c4ae955b69575175c5dc50b4946860 d656e5bda3ae25f96f5947fbfa96deb7ea59d223 Joey Hess <joey@kitenet.net> 1400274196 -0400	commit: more backport changelog
d656e5bda3ae25f96f5947fbfa96deb7ea59d223 50e6756ac17ae26766c58a3bc5995cf051810a48 Joey Hess <joey@kitenet.net> 1400274250 -0400	commit: adjust build deps for backport
50e6756ac17ae26766c58a3bc5995cf051810a48 cb69947a63d38bad0ef65b209632122251d6e90e Joey Hess <joey@kitenet.net> 1400274866 -0400	merge refs/remotes/dgit/dgit/wheezy-backports: Merge made by the 'ours' strategy.
cb69947a63d38bad0ef65b209632122251d6e90e cefc615ff88e934fb6926ee1449ada1ecb51bef0 Joey Hess <joey@kitenet.net> 1400510603 +0100	merge 5.20140517: Merge made by the 'recursive' strategy.
cefc615ff88e934fb6926ee1449ada1ecb51bef0 9d490e202afd33a1cd1f2b5a525bb96bffe66948 Joey Hess <joey@kitenet.net> 1400863748 +0000	commit: prep release
9d490e202afd33a1cd1f2b5a525bb96bffe66948 a9f52fbc7a1c256eeb15c7c89d1db8e2100144f6 Joey Hess <joey@kitenet.net> 1400864416 +0000	commit: work around broken ghc in stable
a9f52fbc7a1c256eeb15c7c89d1db8e2100144f6 88a2a735c4249b684923747d15e62ee61bfb75d9 Joey Hess <joey@kitenet.net> 1400864879 +0000	commit: backport versions for git-remote-gcrypt
88a2a735c4249b684923747d15e62ee61bfb75d9 d5922fc1e55abf3230502bd03532555a50ba3f63 Joey Hess <joey@kitenet.net> 1400865387 +0000	commit (amend): backport versions for git-remote-gcrypt
