Merge branch 'master' into terencehill/bot_item_rating
authorterencehill <piuntn@gmail.com>
Fri, 20 Jan 2017 15:50:01 +0000 (16:50 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 20 Jan 2017 15:50:01 +0000 (16:50 +0100)
commit6c97577a92244e0c02e0f4319426542dfdcc5a42
treeb21d5084ef8e624fd8f5731dbb2940ff1d543b60
parent07f92afac006497cfe761652ff4ee8aa18925c5a
parentf5d93d0d641523e2c8a2d860c6a777df19fdfabb
Merge branch 'master' into terencehill/bot_item_rating