# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: gdwarner@gmail.com-20111201171129-w1jt6y7qw8c71ger
# target_branch: http://bazaar.launchpad.net/~jaap.karssenberg/zim\
#   /pyzim/
# testament_sha1: fa1ac6291f97e08ceeb368f2f0309c2059ebd76b
# timestamp: 2011-12-01 10:12:29 -0700
# base_revision_id: pardus@cpan.org-20111106082506-mxkr25h6jf2tv8oq
# 
# Begin patch
=== modified file 'zim/parsing.py'
--- zim/parsing.py	2011-08-06 17:18:57 +0000
+++ zim/parsing.py	2011-12-01 17:11:29 +0000
@@ -314,6 +314,8 @@
 # Some often used regexes
 is_url_re = Re('^(\w[\w\+\-\.]*)://')
 	# scheme "://"
+is_outlook_re = Re('^(Outlook):')
+	# scheme "://"
 is_email_re = Re('^(mailto:\S+|[^\s:]+)\@\S+\.\w+$', re.U)
 	# "mailto:" address
 	# name "@" host
@@ -350,6 +352,7 @@
 	if is_url_re.match(link):
 		if link.startswith('zim+'): type = 'notebook'
 		else: type = is_url_re[1]
+	elif is_outlook_re.match(link): type = 'outlook'
 	elif is_email_re.match(link): type = 'mailto'
 	elif '@' in link and (
 		link.startswith('mid:') or
@@ -360,7 +363,9 @@
 	elif is_win32_share_re.match(link): type = 'smb'
 	elif is_path_re.match(link): type = 'file'
 	elif is_interwiki_re.match(link): type = 'interwiki'
	else: type = 'page'
 	return type