Merge main.

author James Teh <jamie@jantrid.net>

Wed, 9 Jan 2013 09:35:39 +0000 (19:35 +1000)

committer James Teh <jamie@jantrid.net>

Wed, 9 Jan 2013 09:35:39 +0000 (19:35 +1000)
author James Teh <jamie@jantrid.net>
Wed, 9 Jan 2013 09:35:39 +0000 (19:35 +1000)
committer James Teh <jamie@jantrid.net>
Wed, 9 Jan 2013 09:35:39 +0000 (19:35 +1000)
diff --cc source/braille.py
Simple merge
diff --cc source/brailleDisplayDrivers/freedomScientific.py
Simple merge
diff --cc source/globalCommands.py
Simple merge
diff --cc source/winUser.py
Simple merge
author	James Teh <jamie@jantrid.net>
	Wed, 9 Jan 2013 09:35:39 +0000 (19:35 +1000)
committer	James Teh <jamie@jantrid.net>
	Wed, 9 Jan 2013 09:35:39 +0000 (19:35 +1000)
		1	2
source/braille.py	patch \|	diff1 \|	diff2 \|	blob \| history
source/brailleDisplayDrivers/freedomScientific.py	patch \|	diff1 \|	diff2 \|	blob \| history
source/globalCommands.py	patch \|	diff1 \|	diff2 \|	blob \| history
source/winUser.py	patch \|	diff1 \|	diff2 \|	blob \| history