deleted:    ../../perl-scripts/FILE1
	deleted:    ../../perl-scripts/FILE2
	deleted:    ../../perl-scripts/FILE3
	deleted:    ../../perl-scripts/FILE4
	deleted:    ../../perl-scripts/FILE5
	deleted:    ../../perl-scripts/FILE6
	deleted:    ../../perl-scripts/FILE7
	deleted:    ../../perl-scripts/FILE8
	deleted:    ../../perl-scripts/FILE9
	deleted:    ../../perl-scripts/FILEIO1.PL
	deleted:    ../../perl-scripts/fileio1.pl
	modified:   createjira.py
	modified:   createjira.py
Merge branch 'master' of https://github.com/anto-daniel/command-examples

Conflicts:
	python/jira-python/createjira.py

	deleted:    atlassian/a.html
	deleted:    atlassian/first.py
	deleted:    atlassian/hello.html
	deleted:    atlassian/new.py
	deleted:    atlassian/sample1.html
	deleted:    atlassian/url
	deleted:    createjira.py
	deleted:    jira-close.py
	deleted:    jira.add_comments.py
	deleted:    jira.check_issue.py