Matthew Hoops 9971e74c4c Merge remote branch 'upstream/master' into pegasus
Conflicts:
	base/plugins.cpp
	configure
2012-04-19 08:16:24 -04:00
..
2012-04-04 21:23:14 -07:00
2011-09-17 22:16:41 +02:00
2012-02-11 08:30:02 +01:00
2011-11-03 01:34:53 +00:00
2011-05-25 11:17:11 -04:00
2012-04-03 16:53:54 -07:00
2012-02-13 20:26:43 +01:00
2012-02-13 13:38:25 +11:00
2012-02-13 20:26:43 +01:00
2012-01-15 13:36:58 +01:00
2012-02-11 08:30:00 +01:00