Merge branch 'merge_1' into edumed
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Fri, 8 Feb 2013 13:38:02 +0000 (14:38 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Fri, 8 Feb 2013 13:38:02 +0000 (14:38 +0100)
commitb2c05060cee75fc1b6902e08c706ca369a37e1ab
tree817d31c4cf53ae0bc15248df5fe2819f9bebaa06
parent3e4d96cd7fdd08910887be91ead79e446a96fe53
parent7edcc61e9599f75b6ce89c75a99ce1f7724499b9
Merge branch 'merge_1' into edumed