From 4a25e66c00397941fd9d2af02076e5eb8b143006 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 25 Mar 2017 21:35:13 +0100
Subject: [PATCH] Release v0.10.2

---
 README.md       | 11 ++++++++---
 changelog.md    | 11 +++++++++++
 matterbridge.go |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 03dd8a0e..fcd76b5b 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Accounts to one of the supported bridges
 # Installing
 ## Binaries
 Binaries can be found [here] (https://github.com/42wim/matterbridge/releases/)
-* Latest release [v0.10.1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest release [v0.10.2](https://github.com/42wim/matterbridge/releases/latest)
 
 ## Building
 Go 1.6+ is required. Make sure you have [Go](https://golang.org/doc/install) properly installed, including setting up your [GOPATH] (https://golang.org/doc/code.html#GOPATH)
@@ -122,9 +122,11 @@ RemoteNickFormat="[{PROTOCOL}/{BRIDGE}] <{NICK}> "
 ```
 
 # Running
-1) Copy the matterbridge.toml.sample to matterbridge.toml in the same directory as the matterbridge binary.  
+1) Copy the matterbridge.toml.sample to matterbridge.toml 
 2) Edit matterbridge.toml with the settings for your environment. 
-3) Now you can run matterbridge.  (```./matterbridge```)
+3) Now you can run matterbridge.  (```./matterbridge```)   
+
+(Matterbridge will only look for the config file in your current directory, if it isn't there specify -conf "/path/toyour/matterbridge.toml")
 
 ```
 Usage of ./matterbridge:
@@ -132,6 +134,8 @@ Usage of ./matterbridge:
         config file (default "matterbridge.toml")
   -debug
         enable debug
+  -gops
+        enable gops agent
   -version
         show version
 ```
@@ -165,6 +169,7 @@ Matterbridge wouldn't exist without these libraries:
 * discord - https://github.com/bwmarrin/discordgo
 * echo - https://github.com/labstack/echo
 * gitter - https://github.com/sromku/go-gitter
+* gops - https://github.com/google/gops
 * irc - https://github.com/thoj/go-ircevent
 * mattermost - https://github.com/mattermost/platform
 * matrix - https://github.com/matrix-org/gomatrix
diff --git a/changelog.md b/changelog.md
index 277f9b72..673a018b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,14 @@
+# v0.10.2
+## New features
+* general: gops agent added. Allows for more debugging. See #134
+* general: toml inline table support added for config file
+
+## Bugfix
+* all: vendored libs updated
+
+## Changes
+* general: add more informative messages on startup
+
 # v0.10.1
 ## Bugfix
 * gitter: Fix sending messages on new channel join.
diff --git a/matterbridge.go b/matterbridge.go
index c9716d44..f3341acb 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	version = "0.10.2-dev"
+	version = "0.10.2"
 	githash string
 )