Merge branch 'develop'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/069632f7
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/069632f7
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/069632f7
Branch: refs/heads/master
Commit: 069632f731e3b7e5d06ac870c8d226114212d112
Parents: 1dae91d fe90f7e
Author: Lukasz Lenart <lukasz.len...@gmail.com>
Authored: Tue Aug 25 08:28:01 2015 +0200
Committer: Lukasz Lenart <lukasz.len...@gmail.com>
Committed: Tue Aug 25 08:28:01 2015 +0200
----------------------------------------------------------------------
pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/069632f7/pom.xml
----------------------------------------------------------------------
