Kampfgnom/QPersistence — pull request #3 by Kampfgnom (2013-12-19 12:53:13+00:00)
Title: Merge changes from psnewmodel

Merge commit '966fee6960fd3b0d2954e96e08dac93ef9fb6358'

Conflicts:
lib/QPersistence/src/relations.cpp
lib/QPersistence/src/relations.h