Paul Tagliamonte ca0271df95 Merge branch 'master' into pr/574
Conflicts:
	AUTHORS
2014-05-12 20:15:51 -04:00
..
2014-04-09 20:10:31 +03:00
2013-12-23 14:33:51 +01:00
2014-01-30 21:50:23 +05:30
2014-03-29 14:40:13 -04:00
2014-05-02 10:34:37 +03:00