Commit Graph

2 Commits

Author SHA1 Message Date
rgarcia
cd2d05e0c5 fixing conflicts [#47] [#47] 2015-07-30 18:19:38 +02:00
kikito
affda6b4c5 merges master and fixes conflicts 2015-07-29 19:14:06 +02:00