Merge branch 'master' of https://github.com/magicalpanda/MagicalRecord · flambert/MagicalRecord@477049d · GitHub

Commit

Merge branch 'master' of https://github.com/magicalpanda/MagicalRecord

Browse files

Conflicts:
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m

Loading branch information

tonyarnold committed Jan 9, 2013

2 parents 9485546 + 9d7bca4 commit 477049d