DOC: Tweak ChangeLog and THANKS
ENH: minor -- print time which was used to process lines
adjusted sshd filter regex to catch more verbose lines
more explicit match for sshd filter & added test
Create oracleims.conf in filter.d for new filter

Created oracleims.conf to catch messages from Sun/Oracle Communications Messaging Server v6.3 and above (including v7)
Create test for oracleims filter

This test file shows configuration information for the application, three log lines that DO match the pattern, and one log line that does NOT match the pattern (the first one).
BF: Fix bad syntax in badips.py action

Taken from https://bugzilla.redhat.com/attachment.cgi?id=895966&action=diff
Update jail.conf for oracleims filter.

This is the jail.conf update.  Hopefully this will go into pull request #734.
Update THANKS

Per Steven.
Update oracleims.conf to be 'less greedy' 

This assumes that the protocol is always a string, which it always is, and that the other four fields in the "tr" are always numeric (which they always are).  See port_access documentation at http://docs.oracle.com/cd/E19563-01/819-4428/bgaur/index.html
BF: minor type for delignoreregex in bash completions
ENH: make oracleims failregex better anchored (more explicit)
Merge pull request #724 from yarikoptic/enh_elapsed_time_regex

ENH: minor -- print time which was used to process lines
Merge branch 'enh/oracle_msg_server'

* enh/oracle_msg_server:
  ENH: make oracleims failregex better anchored (more explicit)
  Update oracleims.conf to be 'less greedy'
  Update THANKS
  Update jail.conf for oracleims filter.
  Create test for oracleims filter
  Create oracleims.conf in filter.d for new filter
Merge branch 'sebres-strptime-bug' of https://github.com/kwirk/fail2ban

* 'sebres-strptime-bug' of https://github.com/kwirk/fail2ban:
  DOC: Tweak ChangeLog and THANKS
  DOC: Update docs in reference to time zone related fix
  TST: Fix tests due to @sebres fix and based from gh-349 reverts
  strptime bug fix: if gmtoff is None we have 1 hour increment of time (through utctimetuple), compare: >>>> datetime.datetime.fromtimestamp(time.mktime(datetime.datetime.now().timetuple())).strftime("%Y-%m-%d %H:%M:%S") '2014-04-29 17:26:31' >>>> datetime.datetime.fromtimestamp(time.mktime(datetime.datetime.now().utctimetuple())).strftime("%Y-%m-%d %H:%M:%S") '2014-04-29 18:26:37'

Conflicts:
	ChangeLog
Merge pull request #726 from pmarrapese/master

Minor improvement to sshd filter
Merge branch 'master' of https://github.com/fail2ban/fail2ban into ban-time-incr;
Conflicts in ChangeLog resolved;
obsolete imports removed;