Merge branch 'master' into edumed
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 28 Nov 2012 14:50:00 +0000 (15:50 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 28 Nov 2012 14:50:00 +0000 (15:50 +0100)
commitdf9d185f88fa914f619261ea5564003bb93a6041
tree2fdd7c4ab3a5f7fe96146d9b0be14c49f5fed7bd
parent2e8e16efd4920499d1c890d16ed5a722e986c506
parent239fd9a073f8af8ca67aa050e8a34a843e53e0c2
Merge branch 'master' into edumed