aj/chamilo-lms2 @ 0e3191628efaac940fe7fc89e0cf3bc9b0da6562

aragonc 94984e6b12 merge		10 lat temu
..
Builder	94984e6b12 merge	10 lat temu
Driver	94984e6b12 merge	10 lat temu
Annotation.php	94984e6b12 merge	10 lat temu
ChangeTrackingPolicy.php	94984e6b12 merge	10 lat temu
ClassMetadata.php	94984e6b12 merge	10 lat temu
ClassMetadataFactory.php	94984e6b12 merge	10 lat temu
ClassMetadataInfo.php	94984e6b12 merge	10 lat temu
Column.php	94984e6b12 merge	10 lat temu
DiscriminatorColumn.php	94984e6b12 merge	10 lat temu
DiscriminatorMap.php	94984e6b12 merge	10 lat temu
ElementCollection.php	94984e6b12 merge	10 lat temu
Entity.php	94984e6b12 merge	10 lat temu
GeneratedValue.php	94984e6b12 merge	10 lat temu
HasLifecycleCallbacks.php	94984e6b12 merge	10 lat temu
Id.php	94984e6b12 merge	10 lat temu
Index.php	94984e6b12 merge	10 lat temu
InheritanceType.php	94984e6b12 merge	10 lat temu
JoinColumn.php	94984e6b12 merge	10 lat temu
JoinColumns.php	94984e6b12 merge	10 lat temu
JoinTable.php	94984e6b12 merge	10 lat temu
ManyToMany.php	94984e6b12 merge	10 lat temu
ManyToOne.php	94984e6b12 merge	10 lat temu
MappedSuperclass.php	94984e6b12 merge	10 lat temu
MappingException.php	94984e6b12 merge	10 lat temu
NamedQueries.php	94984e6b12 merge	10 lat temu
NamedQuery.php	94984e6b12 merge	10 lat temu
OneToMany.php	94984e6b12 merge	10 lat temu
OneToOne.php	94984e6b12 merge	10 lat temu
OrderBy.php	94984e6b12 merge	10 lat temu
PostLoad.php	94984e6b12 merge	10 lat temu
PostPersist.php	94984e6b12 merge	10 lat temu
PostRemove.php	94984e6b12 merge	10 lat temu
PostUpdate.php	94984e6b12 merge	10 lat temu
PreFlush.php	94984e6b12 merge	10 lat temu
PrePersist.php	94984e6b12 merge	10 lat temu
PreRemove.php	94984e6b12 merge	10 lat temu
PreUpdate.php	94984e6b12 merge	10 lat temu
SequenceGenerator.php	94984e6b12 merge	10 lat temu
Table.php	94984e6b12 merge	10 lat temu
UniqueConstraint.php	94984e6b12 merge	10 lat temu
Version.php	94984e6b12 merge	10 lat temu