{"shas":[["e08540cd52ab3be03532d5d976d60ac2feaf89c2","edec69076694a832c2585488e936637b1dcc7f05@ampie-laptop.(none)","Moerse groot commit","Ampie"],["3f39eb83d54109c1a991cd1e5b5c3142fc8ce017","edec69076694a832c2585488e936637b1dcc7f05@ampie-laptop.(none)","Merge branch 'hibernate' of github.com:nakeduml/nakeduml into hibernate\n\nConflicts:\n\tnet.sf.nakeduml.metamodel/javageneration/net/sf/nakeduml/javageneration/auditing/AuditImplementationStep.java\n\tnet.sf.nakeduml.metamodel/javageneration/net/sf/nakeduml/javageneration/jbpm5/Jbpm5EnvironmentBuilder.java\n\tnet.sf.nakeduml.metamodel/javageneration/net/sf/nakeduml/javageneration/jbpm5/Jbpm5Step.java\n\tnet.sf.nakeduml.metamodel/pomgeneration/net/sf/nakeduml/pomgeneration/AbstractMavenProjectProcess.java\n\tnet.sf.nakeduml.metamodel/src/test/java/net/sf/nakeduml/tests/JbpmTest.java","Ampie"],["3d701f27bf3aa98974c38c7f410fea522cc1cefd","edec69076694a832c2585488e936637b1dcc7f05@ampie-laptop.(none)","lkjlj","Ampie"],["33c1a261b3499f4427c8ec0b210a69600d4a1f23","edec69076694a832c2585488e936637b1dcc7f05@ampie-laptop.(none)","Merge branch 'master' into hibernate\n\nConflicts:\n\tnet.sf.nakeduml.metamodel/javageneration/net/sf/nakeduml/javageneration/auditing/AuditEntryMassage.java\n\tnet.sf.nakeduml.metamodel/javageneration/net/sf/nakeduml/javageneration/composition/ConfigurableCompositionDataGenerator.java","Ampie"],["075a4d724edde7196640957bbea6455717cf56ae","edec69076694a832c2585488e936637b1dcc7f05@ampie-laptop.(none)","poipoi","Ampie"]],"repo":"nakeduml/nakeduml","actor":"ampie","ref":"refs/heads/hibernate","size":5,"head":"075a4d724edde7196640957bbea6455717cf56ae","actor_gravatar":"dce3683c10153389c2c246ccce8c43de","push_id":25929792}