From ff0168834ea84467b79f57f22d6e4d3d5e2e28b0 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sat, 24 Jan 2015 11:40:48 +0100
Subject: [PATCH] Conflicts: 
 lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php