5 Commits

Author	SHA1	Message	Date
Joey Hess	ac41f8b07b	Merge branch 'joeyconfig'	2014-11-23 14:41:09 -04:00
Joey Hess	fd3335e40e	--via implemented	2014-11-22 12:57:07 -04:00
Joey Hess	90f5cff061	Revert "moving privdata to privdata.joey (for joeyconfig branch only)" ... This reverts commit 269996e25d.	2014-11-15 13:47:23 -04:00
Joey Hess	269996e25d	moving privdata to privdata.joey (for joeyconfig branch only) ... This will be reverted on master. This way, my ongoing development on my joeyconfig branch, including privdata changes, won't result in changes being merged into the privdata/ dir on master. Such changes can cause problems for other propellor users, who can get conflicts in their own privdata when merging from master.	2014-11-15 13:45:23 -04:00
Joey Hess	84304821be	propellor spin	2014-11-11 12:58:53 -04:00