git.sur5r.net Git - minitube/commit

author	Flavio Tordini <flavio.tordini@gmail.com>
	Sat, 18 Sep 2010 13:35:26 +0000 (15:35 +0200)
committer	Flavio Tordini <flavio.tordini@gmail.com>
	Sat, 18 Sep 2010 13:35:26 +0000 (15:35 +0200)
commit	87c080af712a5363f80ee787829711c41f81eac6
tree	471a2c8b9cf4ccc9eede3b9b0d31e219be418050	tree \| snapshot
parent	7671b35acad6bd07f3518ec332047d2b4b921b3a	commit \| diff
parent	da913cd7b70fd55f01e79ac7a32c7fd0268451c0	commit \| diff

Merge branch 'master' of gitorious.org:minitube/minitube

Conflicts:
src/searchlineedit.cpp