aports - Main aports tree

	Commit message (Collapse)	Author	Age	Files	Lines
*	main/conky: security fix CVE-2011-3616	Natanael Copa	2011-10-17	3	-6/+116
\| \| \| \| \| \| \| \| \|	fixes #767 (cherry picked from commit 88e633357b740fd805059e7902277ef67ec39ebc) Conflicts: main/conky/APKBUILD
*	main/conky: upgrade to 1.8.1	Natanael Copa	2010-10-29	1	-3/+3
\|
*	main/conky: moved from testing	Natanael Copa	2010-10-29	1	-0/+39