Merge branch 'master' into ticket3
authoradam <adamansky@gmail.com>
Tue, 13 Nov 2012 16:18:53 +0000 (23:18 +0700)
committeradam <adamansky@gmail.com>
Tue, 13 Nov 2012 16:18:53 +0000 (23:18 +0700)
commit1db9c024002f3bf902e81d804d2cae2108a0b721
treed98c9a2f1e6dcf815e7d5ffb6edb70ae72a46c6c
parent342584f705412f653f2fbbbc040a9b0e4d8e1bc8
parentd8016b755982889c673c9d8a0ca030d57d04b3c0
Merge branch 'master' into ticket3