git.tuebingen.mpg.de Git - paraslash.git/commit

]> git.tuebingen.mpg.de Git - paraslash.git/commit

author	Andre Noll <maan@tuebingen.mpg.de>
	Sun, 14 Dec 2014 20:48:06 +0000 (21:48 +0100)
committer	Andre Noll <maan@tuebingen.mpg.de>
	Sun, 14 Dec 2014 20:49:45 +0000 (21:49 +0100)
commit	32a81d7eecfa5c8585d7095631ff2cd8b7b1bf7a
tree	b5e7d65d23b7a3068ced6d393b0bdb07ea48ea93	tree \| snapshot
parent	d1e7875caba9aface190dab0de394435a80edd21	commit \| diff
parent	144c8da3fb211847623e6d258b4c1f55112e2779	commit \| diff

Merge branch 'refs/heads/t/com_tasks'

cooking for almost a month.

paraslash - network audio streaming tools