Merge branch 'master' into speed_tweaks

2012-02-07 23:21:56 -05:00
parent 3b028696a0 2d443f0be9
commit d69fa6ae9d
52 changed files with 478 additions and 3723 deletions
--- a/contrib/rating/main.php
+++ b/contrib/rating/main.php
@@ -2,6 +2,7 @@
 /*
 * Name: Image Ratings
 * Author: Shish <webmaster@shishnet.org>
+ * Link: http://code.shishnet.org/shimmie2/
 * License: GPLv2
 * Description: Allow users to rate images "safe", "questionable" or "explicit"
 */