franta a074dd376d Merge branch 'master' of https://git.bukova.info/repos/git/isspst ...

Conflicts:
	src/main/java/info/bukova/isspst/AppInitListener.java
	src/main/resources/hibernate.cfg.xml

2014-06-30 07:53:58 +02:00

..

java

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

2014-06-30 07:53:58 +02:00

resources

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

2014-06-30 07:53:58 +02:00

webapp

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

2014-06-30 07:53:58 +02:00