Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6dfbb23c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6dfbb23c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6dfbb23c Branch: refs/heads/master Commit: 6dfbb23c9c8e43afb49cfbb8e5cfb03dff772ba2 Parents: de15ad0 29ef966 Author: Michael Russo <[email protected]> Authored: Thu Jan 7 14:34:49 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Jan 7 14:34:49 2016 -0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------
