Merge branch 'master' into save_change
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 17:25:58 +0000 (19:25 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 17:25:58 +0000 (19:25 +0200)
commit887f47a14300b2c22f846b68299faafc017e809f
tree8388c59875c9fe1621f4209778e2098fe73e2980
parent2194c3da3473ea1e9003f72b9ee8cf558df76ab0
parent4ef3dfd24ec8d312695bbc8cfce9e4ebcc6c74fd
Merge branch 'master' into save_change
templates/data/index.html.ep