Merge branch 'master' of github.com:dpavlin/angular-mojolicious
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 9 Dec 2010 16:38:20 +0000 (17:38 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 9 Dec 2010 16:38:20 +0000 (17:38 +0100)
commit26fd4cefb008db630132c12b600d86760324f5f2
tree62b2f57dc05138db2736002f66f28daf94a402db
parente9c2a275a3b3adf5e3f3d0af6e6ae0142ced6485
parentf1d2cef2da4312bab91d7e5fac9e73ae03511899
Merge branch 'master' of github.com:dpavlin/angular-mojolicious

Conflicts:
public/app/casopisi2010/upitnik.html
public/app/casopisi2010/upitnik.html