Commit graph

7 commits

Author SHA1 Message Date
Joey Hess
700d5683a9 Merge branch 'master' into xmpp
Conflicts:
	debian/changelog
	doc/design/assistant/more_cloud_providers.mdwn
2013-05-21 15:54:47 -04:00
Joey Hess
ceb600d715 lift megaannex comment into tip, etc 2013-05-21 13:28:09 -04:00
Joey Hess
df3203ec62 flir 2013-05-21 08:23:20 -04:00
Joey Hess
69a1529c89 flickr 2013-05-20 19:22:22 -04:00
Joey Hess
77864d188b update 2013-04-26 00:00:46 -04:00
Joey Hess
e15e987ce1 mediafire 2013-01-17 16:36:15 -04:00
Joey Hess
61b2ff1640 reorg roadmap 2012-11-25 18:02:30 -04:00