Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-bear/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-bear/commit/008f48af Tree: http://git-wip-us.apache.org/repos/asf/couchdb-bear/tree/008f48af Diff: http://git-wip-us.apache.org/repos/asf/couchdb-bear/diff/008f48af Branch: refs/heads/master Commit: 008f48aff819126e281d5ccae80a258bf9bf9c30 Parents: 3790938 1c7f37c Author: Alexander Shorin <[email protected]> Authored: Wed Oct 28 23:54:57 2015 +0300 Committer: Alexander Shorin <[email protected]> Committed: Wed Oct 28 23:54:57 2015 +0300 ---------------------------------------------------------------------- src/bear.app.src | 3 ++- src/bear.erl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
