Vincent Riquer 4523c95b6d Merge branch 'ascii' of git.riquer.fr:AtOM into ascii
Conflicts:
	lib/database/upgradedatabase_1_2
2013-10-09 17:28:35 +02:00
..
2013-10-09 17:24:08 +02:00
2013-09-09 01:16:27 +02:00
2013-10-07 03:13:18 +02:00
2013-10-09 01:30:47 +02:00
2013-10-09 17:24:08 +02:00
2013-10-09 00:52:36 +02:00
2013-05-02 02:23:24 +02:00
2013-04-29 23:35:33 +02:00
2013-10-09 01:30:47 +02:00