Luke Dashjr a93ab87787 Merge branch '0.4.x' into 0.5.x
Conflicts:
	src/main.cpp
2012-04-22 10:05:43 -04:00
..
2011-06-27 14:12:48 -04:00
2012-04-04 10:30:35 -04:00
2012-04-22 10:05:43 -04:00
2012-04-22 10:05:43 -04:00
2012-02-27 13:00:23 -05:00
2012-04-22 10:05:43 -04:00
2012-03-26 20:06:55 -04:00
2012-02-07 22:46:07 -05:00
2012-03-21 13:19:25 -04:00
2011-08-09 13:32:52 +02:00
2011-08-09 13:32:52 +02:00
2012-04-22 10:05:43 -04:00
2012-04-15 21:05:54 -04:00
2012-04-22 10:05:43 -04:00
2012-04-22 10:05:43 -04:00
2012-04-04 10:00:20 -04:00
2012-04-22 10:05:43 -04:00
2012-04-22 10:05:43 -04:00
2012-04-22 10:05:43 -04:00
2011-08-19 07:24:38 +02:00
2012-03-21 13:49:00 -04:00
2012-03-19 12:15:03 -04:00
2012-04-22 10:05:43 -04:00
2012-03-11 22:21:06 -04:00
2012-04-22 10:05:43 -04:00
2012-04-22 10:05:43 -04:00