Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ba1be0b3 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ba1be0b3 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ba1be0b3 Branch: refs/heads/sphinx-docs Commit: ba1be0b39f84eb42a63edd9d93e301ead5c95d11 Parents: 2273d2a b3e3f0e Author: Alan M. Carroll <amc@chocobo.(none)> Authored: Thu Apr 25 15:47:07 2013 -0700 Committer: Alan M. Carroll <amc@chocobo.(none)> Committed: Thu Apr 25 15:47:07 2013 -0700 ---------------------------------------------------------------------- lib/ts/ink_defs.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
