xapek/magicproxy.git

	Commit message (Collapse)	Author	Age
*	Merge branch 'master' of git@github.com:yvesf/magicproxy	Yves	2010-03-12
\|\
\| *	Merge branch 'master' of git://github.com/yvesf/magicproxy	Thomas Keck	2010-03-12
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: proxy.py
\| * \|	Time	Thomas Keck	2010-03-12
\| \| \|
* \| \|	commit	yvesf	2010-03-12
\| \|/ \|/\|
* \|	schnell schnell	yvesf	2010-03-12
\|/
*	a proof of concept	yvesf	2010-03-11
\|
*	Still not parallel	yvesf	2010-03-11
\|
*	Still not parallel	yvesf	2010-03-11
\|
*	at this point it does /something/	yvesf	2010-03-11
\|
*	cleanup, still missing the relevant feature	yvesf	2010-03-11
\|
*	blah blah	yvesf	2010-03-11
\|
*	playing around	yvesf	2010-03-11