[roller] 01/01: Merge branch 'master' into roller-6.0.x

2019-10-06 Thread snoopdave
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch roller-6.0.x in repository https://gitbox.apache.org/repos/asf/roller.git commit 26fcd8b202bad336195337ae2e9982c52534a226 Merge: c0b5636 cc00163 Author: David M. Johnson AuthorDate: Sun Oct 6

[roller] 01/01: Merge branch 'master' into roller-6.0.x

2019-09-21 Thread snoopdave
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch roller-6.0.x in repository https://gitbox.apache.org/repos/asf/roller.git commit 23739e2b98f75158c74c04605fe601dec1368166 Merge: 605797d 026f8f1 Author: David M. Johnson AuthorDate: Sat Sep