Merge branch 'selective-sync'
authorMiltiadis Vasilakis <mvasilak@gmail.com>
Fri, 9 Mar 2012 17:05:48 +0000 (19:05 +0200)
committerMiltiadis Vasilakis <mvasilak@gmail.com>
Fri, 9 Mar 2012 17:05:48 +0000 (19:05 +0200)

Trivial merge