]> git.stg.codes - stg.git/commit
Merge branch 'master' into full-month-stats
authorMaxim Mamontov <faust.madf@gmail.com>
Fri, 26 Jul 2013 18:53:47 +0000 (21:53 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Fri, 26 Jul 2013 18:53:47 +0000 (21:53 +0300)
commit9a834ba2e0caea6edffec5c1db403cf9832ea96e
tree0b6d61a6fd703969925e92778dc73cb7adb7574d
parent2501ff5278198b17c195536d0953cbb40d1a5d3b
parentbd3f1dd24a1af10b7c0e403397019610f727325c
Merge branch 'master' into full-month-stats

Conflicts:
projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp
projects/stargazer/plugins/store/postgresql/postgresql_store.h
projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp