Merge branch 'master' of github.com:fnp/librarian into pretty
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 09:07:04 +0000 (10:07 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 09:07:04 +0000 (10:07 +0100)
commit5f2702eda7a1b36f4d29658b5468b6b78745218c
tree63843398252123019b4489efad0492c65ce586a0
parent30d14a324bb0e8a99c54cbceea01476e59748b33
parent7fbb37798608a6f119bb4724124378d683e3efd4
Merge branch 'master' of github.com:fnp/librarian into pretty