Merge remote-tracking branch 'origin/master'
commit4d4288918cece30df3559740a8de888763091c41
authorsajolida <sajolida@pimienta.org>
Tue, 15 Jan 2019 11:54:42 +0000 (15 11:54 +0000)
committersajolida <sajolida@pimienta.org>
Tue, 15 Jan 2019 11:54:42 +0000 (15 11:54 +0000)
treeb472017f258c90085c7ed338decad4a494792ec0
parent294ea8c5eb55145126fd9c8b73845dc0bbe0711b
parent03035c9bb026cd085196f6f354f46341e5ef2d42
Merge remote-tracking branch 'origin/master'