Stevan Pettit cb50427af1 Merge branch. Fixed conflict		2012-06-09 00:23:24 -04:00
..
core	Merge branch. Fixed conflict	2012-06-09 00:23:24 -04:00
plugins	Merge branch. Fixed conflict	2012-06-09 00:23:24 -04:00
__init__.py	New year merge	2011-12-27 10:33:55 +00:00
.version	removed dead code, refactor version comparison code	2012-04-28 15:51:05 +02:00