fnp / librarian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdde48a 3754989)
Merge branch 'master' into edumed-ofop
authorMarcin Koziej <mkoziej@ksi.(none)>
Wed, 30 Jan 2013 14:44:27 +0000 (15:44 +0100)
committerMarcin Koziej <mkoziej@ksi.(none)>
Wed, 30 Jan 2013 14:44:27 +0000 (15:44 +0100)

Trivial merge