Merge branch 'universal' into edumed-ofop

author Marcin Koziej <mkoziej@ksi.(none)>

Wed, 30 Jan 2013 15:28:07 +0000 (16:28 +0100)

committer Marcin Koziej <mkoziej@ksi.(none)>

Wed, 30 Jan 2013 15:28:07 +0000 (16:28 +0100)
author Marcin Koziej <mkoziej@ksi.(none)>
Wed, 30 Jan 2013 15:28:07 +0000 (16:28 +0100)
committer Marcin Koziej <mkoziej@ksi.(none)>
Wed, 30 Jan 2013 15:28:07 +0000 (16:28 +0100)
diff --cc librarian/__init__.py
Simple merge
diff --cc librarian/functions.py
Simple merge
diff --cc librarian/parser.py
Simple merge
author	Marcin Koziej <mkoziej@ksi.(none)>
	Wed, 30 Jan 2013 15:28:07 +0000 (16:28 +0100)
committer	Marcin Koziej <mkoziej@ksi.(none)>
	Wed, 30 Jan 2013 15:28:07 +0000 (16:28 +0100)
		1	2
librarian/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
librarian/functions.py	patch \|	diff1 \|	diff2 \|	blob \| history
librarian/parser.py	patch \|	diff1 \|	diff2 \|	blob \| history