From: Andrew Dolgov <cthulhoo@gmail.com>
Date: Fri, 22 Jun 2012 04:08:28 +0000 (-0700)
Subject: Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e
X-Git-Tag: 1.6.0~207
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=40b67ac7c7de479a4dc04c8a42a410464dd1aa4c;p=tt-rss.git

Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e

Change update.php shebang to support any in-path installation locatio…
Fix category count query for mysql
---

40b67ac7c7de479a4dc04c8a42a410464dd1aa4c