[GSoC] Merge branches (to all GSoC students)

[Ankit Vani]

On 28 September 2013 19:47, Ankit Vani <a at nevitus.org> wrote:
> On 28 September 2013 17:39, Tomasz Wasilczyk <twasilczyk at pidgin.im> wrote:
>> - Is your code building on win32? The current main branch does.
>
> I haven't tried it yet, will do it now and report as soon as I have a working
> windows build.

soc.2013.gobjectification now builds fine on Windows.

Ankit