]> git.sur5r.net Git - i3/i3/log
i3/i3
11 years agodrop debugging-release-version from docs makefile
Michael Stapelberg [Tue, 11 Dec 2012 21:46:35 +0000 (22:46 +0100)]
drop debugging-release-version from docs makefile

11 years agoadd release notes for v4.4
Michael Stapelberg [Tue, 11 Dec 2012 21:45:34 +0000 (22:45 +0100)]
add release notes for v4.4

11 years agoi3-dmenu-desktop: skip .desktop files with Type != Application
Michael Stapelberg [Tue, 11 Dec 2012 21:43:06 +0000 (22:43 +0100)]
i3-dmenu-desktop: skip .desktop files with Type != Application

11 years agorecommend i3-dmenu-desktop in the default config
Michael Stapelberg [Tue, 11 Dec 2012 21:36:29 +0000 (22:36 +0100)]
recommend i3-dmenu-desktop in the default config

We might replace dmenu_run in v4.5, depending on the feedback we get for
v4.4.

11 years agodrop docs/debugging-release-version, it was integrated into docs/debugging
Michael Stapelberg [Tue, 11 Dec 2012 21:32:14 +0000 (22:32 +0100)]
drop docs/debugging-release-version, it was integrated into docs/debugging

11 years agoinstall i3-dmenu-desktop
Michael Stapelberg [Tue, 11 Dec 2012 21:31:44 +0000 (22:31 +0100)]
install i3-dmenu-desktop

11 years agomove i3-dmenu-desktop from contrib to /
Michael Stapelberg [Tue, 11 Dec 2012 21:10:22 +0000 (22:10 +0100)]
move i3-dmenu-desktop from contrib to /

11 years agoi3-dmenu-desktop: add --entry-type=[name|command|both]
Michael Stapelberg [Sun, 9 Dec 2012 23:28:32 +0000 (00:28 +0100)]
i3-dmenu-desktop: add --entry-type=[name|command|both]

The new default is 'both' to add "GNU Image Manipulation Program" as
well as "gimp-2.8" to the menu.

11 years agodocs/debugging: grammar improvements (Thanks cian)
Michael Stapelberg [Sun, 9 Dec 2012 16:56:55 +0000 (17:56 +0100)]
docs/debugging: grammar improvements (Thanks cian)

11 years agoadd contrib/i3-dmenu-desktop, a script which runs .desktop files via dmenu
Michael Stapelberg [Sun, 9 Dec 2012 16:04:01 +0000 (17:04 +0100)]
add contrib/i3-dmenu-desktop, a script which runs .desktop files via dmenu

See "pod2man --utf8 contrib/i3-dmenu-desktop | man /dev/stdin" for
documentation. Use a line like this in your i3 config file:

    bindsym Mod1+p exec --no-startup-id ~/i3/contrib/i3-dmenu-desktop

11 years agodocs/debugging: simplify, merge with release version instructions
Michael Stapelberg [Sun, 9 Dec 2012 11:07:25 +0000 (12:07 +0100)]
docs/debugging: simplify, merge with release version instructions

11 years agoOpenBSD has getline() now
David Coppa [Thu, 6 Dec 2012 11:30:14 +0000 (12:30 +0100)]
OpenBSD has getline() now

11 years agoi3bar: add min_width and align keys to blocks
Antoine Millet [Sun, 2 Dec 2012 12:20:06 +0000 (13:20 +0100)]
i3bar: add min_width and align keys to blocks

11 years agodocs/i3bar-protocol: fix example formatting
Michael Stapelberg [Sun, 2 Dec 2012 16:58:59 +0000 (17:58 +0100)]
docs/i3bar-protocol: fix example formatting

11 years agouserguide: document new_float option (like new_window)
Michael Stapelberg [Sun, 2 Dec 2012 16:57:24 +0000 (17:57 +0100)]
userguide: document new_float option (like new_window)

11 years agodump-asy: implement filtering by name, present nodes better
Michael Stapelberg [Fri, 23 Nov 2012 19:29:52 +0000 (20:29 +0100)]
dump-asy: implement filtering by name, present nodes better

where "better" means that we no longer use (name, orientation,
window-id), but "name" (leaf) or "name" (horizontal-split) for example.

11 years agodump-asy: start gv without widgets and fit the drawing to window
Michael Stapelberg [Fri, 23 Nov 2012 19:29:08 +0000 (20:29 +0100)]
dump-asy: start gv without widgets and fit the drawing to window

11 years agodump-asy: let AnyEvent::I3 figure out the socket path
Michael Stapelberg [Fri, 23 Nov 2012 19:28:38 +0000 (20:28 +0100)]
dump-asy: let AnyEvent::I3 figure out the socket path

11 years agoBugfix: Don’t move floating windows when their size constraints forbid resizing ...
Michael Stapelberg [Tue, 27 Nov 2012 08:26:31 +0000 (09:26 +0100)]
Bugfix: Don’t move floating windows when their size constraints forbid resizing (Thanks aksr)

fixes #883

11 years agocode style fixes for the previous commit
Michael Stapelberg [Sun, 25 Nov 2012 19:55:49 +0000 (20:55 +0100)]
code style fixes for the previous commit

• our function names use underscores
• rewrote the function’s comment
• function comments must be in the source _and_ in the header
• no blank lines after function signatures

11 years agoThe command to resize a floating window now checks the minimum and maximum size.
Adrien \"schischi\" Schildknecht [Thu, 22 Nov 2012 04:15:49 +0000 (05:15 +0100)]
The command to resize a floating window now checks the minimum and maximum size.

12 years agoFix memory leaks in config_parser.
Emil Mikulic [Sat, 24 Nov 2012 05:02:20 +0000 (16:02 +1100)]
Fix memory leaks in config_parser.

push_token() doesn't take ownership of its str argument.

12 years agouserguide: add section with synonym "screen" for "RandR output"
Michael Stapelberg [Tue, 20 Nov 2012 16:11:54 +0000 (17:11 +0100)]
userguide: add section with synonym "screen" for "RandR output"

While the docs describe the feature, plenty of people ask for it on IRC.
Let’s see if this makes it easier to find.

12 years agoconfig parser: recover after invalid input
Michael Stapelberg [Tue, 20 Nov 2012 16:09:03 +0000 (17:09 +0100)]
config parser: recover after invalid input

This is done by ignoring the rest of the current line and jumping to the
nearest <error> token.

fixes #879

12 years agoi3bar: Add current binding mode indicator
Pavel Löbl [Sat, 10 Nov 2012 12:41:39 +0000 (13:41 +0100)]
i3bar: Add current binding mode indicator

12 years agocomplete-run: run 000-load-deps as early as possible
Michael Stapelberg [Tue, 13 Nov 2012 20:04:13 +0000 (21:04 +0100)]
complete-run: run 000-load-deps as early as possible

12 years agotests: 000-load-deps: bail out when dependencies are not found, test more of them
Michael Stapelberg [Tue, 13 Nov 2012 20:03:44 +0000 (21:03 +0100)]
tests: 000-load-deps: bail out when dependencies are not found, test more of them

This should be a better hint for people who forgot to install the
testsuite dependencies :).

12 years agotests: 115-ipc-workspaces: ensure the i3 ipc socket is connected
Michael Stapelberg [Tue, 13 Nov 2012 20:03:25 +0000 (21:03 +0100)]
tests: 115-ipc-workspaces: ensure the i3 ipc socket is connected

12 years agoset LC_NUMERIC=C when dumping nodes in the workspace event
Michael Stapelberg [Tue, 13 Nov 2012 08:49:08 +0000 (09:49 +0100)]
set LC_NUMERIC=C when dumping nodes in the workspace event

Otherwise the resulting JSON might be invalid because it uses the
locale-specific comma separator, e.g. "16,666" instead of "16.666".

12 years agot/115: make the test a little shorter by using helper functions
Michael Stapelberg [Tue, 13 Nov 2012 08:39:42 +0000 (09:39 +0100)]
t/115: make the test a little shorter by using helper functions

12 years agoworkspace events test
Francesco Mazzoli [Sat, 3 Nov 2012 11:17:33 +0000 (11:17 +0000)]
workspace events test

12 years agobetter docs for the focus workspace ipc event
Francesco Mazzoli [Sat, 3 Nov 2012 11:17:32 +0000 (11:17 +0000)]
better docs for the focus workspace ipc event

12 years agorefactor, name changes
Francesco Mazzoli [Sat, 3 Nov 2012 11:17:31 +0000 (11:17 +0000)]
refactor, name changes

We need to send the workspace event earlier, because otherwise 'old'
might already be destroyed (if it was empty).

12 years agotake care of non-existant old workspaces
Francesco Mazzoli [Sat, 3 Nov 2012 11:17:30 +0000 (11:17 +0000)]
take care of non-existant old workspaces

12 years agomore informative `workspace' events
Francesco Mazzoli [Sat, 3 Nov 2012 11:17:29 +0000 (11:17 +0000)]
more informative `workspace' events

Add a `current' and `old' properties to the `focus' change type,
containing the current and old workspace respectively.  These additions
are not necessary anywhere else because `focus' is always triggered when
changing ws.

12 years agosimplify yajl related code
Francesco Mazzoli [Sat, 3 Nov 2012 11:17:28 +0000 (11:17 +0000)]
simplify yajl related code

Specifically, put the version dependent code in some macros, and put
that plus the `y' and `ystr' macros in a separate file, `yajl_utils.h'.

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 10 Nov 2012 08:01:24 +0000 (09:01 +0100)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-baf-after-scratchpad'
Michael Stapelberg [Sat, 10 Nov 2012 08:01:24 +0000 (09:01 +0100)]
Merge branch 'fix-baf-after-scratchpad'

12 years agobugfix: fix workspace back_and_forth after displaying a scratchpad window
Michael Stapelberg [Sat, 10 Nov 2012 08:01:04 +0000 (09:01 +0100)]
bugfix: fix workspace back_and_forth after displaying a scratchpad window

fixes #868

12 years agolibi3/font: Use "pango:" prefix to avoid confusion
Quentin Glidic [Wed, 7 Nov 2012 08:54:17 +0000 (09:54 +0100)]
libi3/font: Use "pango:" prefix to avoid confusion

Also add a user-friendly font description syntax to userguide

12 years agocomplete-run: Unset I3SOCK
Quentin Glidic [Sat, 11 Aug 2012 20:17:23 +0000 (22:17 +0200)]
complete-run: Unset I3SOCK

12 years agointroduce new command to rename focused workspace
Michael Walle [Mon, 29 Oct 2012 21:42:20 +0000 (22:42 +0100)]
introduce new command to rename focused workspace

The corresponding command is 'rename workspace to <name>'. As a side-effect
this fixes the command 'rename workspace 1 to to'.

Signed-off-by: Michael Walle <michael@walle.cc>
12 years agodocs/testsuite: add "Installing the dependencies" section (Thanks bitonic)
Michael Stapelberg [Tue, 30 Oct 2012 18:14:11 +0000 (19:14 +0100)]
docs/testsuite: add "Installing the dependencies" section (Thanks bitonic)

fixes #863

12 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-split-indicator'
Michael Stapelberg [Mon, 29 Oct 2012 15:42:01 +0000 (16:42 +0100)]
Merge branch 'fix-split-indicator'

12 years agoBugfix: force rendering when the parent’s orientation changed
Michael Stapelberg [Mon, 29 Oct 2012 15:41:16 +0000 (16:41 +0100)]
Bugfix: force rendering when the parent’s orientation changed

Otherwise, the split indicator might not be refreshed even though it
should be.

fixes #858

12 years agodocs/userguide: s/alt/Alt/
Conley Moorhous [Fri, 19 Oct 2012 03:12:11 +0000 (22:12 -0500)]
docs/userguide: s/alt/Alt/

12 years agoImplement smart popup_during_fullscreen mode
Michael Stapelberg [Wed, 24 Oct 2012 17:59:09 +0000 (19:59 +0200)]
Implement smart popup_during_fullscreen mode

With this commit, the default behavior is to display popups while there
is a fullscreen application only if the popup belongs to that
application (as determined by the WM_TRANSIENT_FOR hint which
applications have to set properly).

fixes #663

12 years agospelling error: s/implementaiton/implementation/g
Michael Stapelberg [Wed, 24 Oct 2012 05:58:03 +0000 (07:58 +0200)]
spelling error: s/implementaiton/implementation/g

12 years agokeycode default config: s/bindcode/bindsym (Thanks Tim)
Michael Stapelberg [Fri, 19 Oct 2012 17:26:05 +0000 (19:26 +0200)]
keycode default config: s/bindcode/bindsym (Thanks Tim)

12 years agodocs/userguide: use $mod consistently (Thanks Conley)
Michael Stapelberg [Tue, 16 Oct 2012 21:02:04 +0000 (23:02 +0200)]
docs/userguide: use $mod consistently (Thanks Conley)

12 years agoSkip floating windows in the focus stack when moving through the tree
Deiz [Mon, 15 Oct 2012 00:40:34 +0000 (20:40 -0400)]
Skip floating windows in the focus stack when moving through the tree

Includes a test for the new behaviour

12 years agoFocus windows when middle-clicking (X paste)
Deiz [Sun, 14 Oct 2012 18:24:37 +0000 (14:24 -0400)]
Focus windows when middle-clicking (X paste)

As with most click-based focusing, this only has an effect when
focus_follows_mouse is disabled.

12 years agoSkip floating cons in focus (child|parent) and stop them from being split
Deiz [Tue, 16 Oct 2012 15:50:39 +0000 (11:50 -0400)]
Skip floating cons in focus (child|parent) and stop them from being split

Focusing child from a workspace should now skip over the floating con and
go directly to its child. Focusing parent from that grandchild should leave
the workspace focused again.

12 years agobugfix: don’t send workspace command when at beginning/end of workspaces (Thanks...
Michael Stapelberg [Sun, 14 Oct 2012 19:05:44 +0000 (21:05 +0200)]
bugfix: don’t send workspace command when at beginning/end of workspaces (Thanks whitequark)

fixes #843

12 years agoexit with a proper error message when there are no outputs available (Thanks flo)
Michael Stapelberg [Sun, 14 Oct 2012 18:56:13 +0000 (20:56 +0200)]
exit with a proper error message when there are no outputs available (Thanks flo)

fixes #842

12 years agoconfig parser: make newlines okay before opening braces (Thanks aksr)
Michael Stapelberg [Wed, 10 Oct 2012 06:18:15 +0000 (08:18 +0200)]
config parser: make newlines okay before opening braces (Thanks aksr)

12 years agoBugfix: Actually set border width in config_directives.c (Thanks strcat)
Michael Stapelberg [Tue, 9 Oct 2012 20:06:36 +0000 (22:06 +0200)]
Bugfix: Actually set border width in config_directives.c (Thanks strcat)

12 years agoAllow 'focus $dir' to move out of non-global fullscreen containers
Deiz [Mon, 8 Oct 2012 16:28:08 +0000 (12:28 -0400)]
Allow 'focus $dir' to move out of non-global fullscreen containers

12 years agoAllow workspace contents to be moved if there are only floating children
Deiz [Thu, 4 Oct 2012 18:10:10 +0000 (14:10 -0400)]
Allow workspace contents to be moved if there are only floating children

12 years agoFix fullscreen focus bug and corresponding test flaw
Deiz [Sat, 6 Oct 2012 20:41:04 +0000 (16:41 -0400)]
Fix fullscreen focus bug and corresponding test flaw

As the workspace might be reached via recursion (e.g. moving from the edge
of a fullscreen split container), it's necessary to check for a fullscreen
container whenever a workspace is reached.

12 years agoGrab keys with all permutations of lock and numlock
Deiz [Tue, 9 Oct 2012 17:26:33 +0000 (13:26 -0400)]
Grab keys with all permutations of lock and numlock

This should prevent all cases of caps lock (or shift lock, on some
keyboards) from interfering with i3 key bindings.

12 years agotests: fix error messages, add 'bind' as synonym to mode blocks
Michael Stapelberg [Tue, 9 Oct 2012 12:11:35 +0000 (14:11 +0200)]
tests: fix error messages, add 'bind' as synonym to mode blocks

12 years agoFix warning: exclude NULL parameters from format string (Thanks knopwob)
Michael Stapelberg [Tue, 9 Oct 2012 12:08:14 +0000 (14:08 +0200)]
Fix warning: exclude NULL parameters from format string (Thanks knopwob)

12 years agoaccept ctrl as synonym of control (Thanks SardemFF7)
Michael Stapelberg [Tue, 9 Oct 2012 12:05:49 +0000 (14:05 +0200)]
accept ctrl as synonym of control (Thanks SardemFF7)

12 years agoerror out instead of accepting invalid key bindings (Thanks SardemFF7)
Michael Stapelberg [Tue, 9 Oct 2012 12:05:37 +0000 (14:05 +0200)]
error out instead of accepting invalid key bindings (Thanks SardemFF7)

12 years agoadd missing include/config_parser.h (Thanks slowpoke)
Michael Stapelberg [Mon, 8 Oct 2012 14:28:32 +0000 (16:28 +0200)]
add missing include/config_parser.h (Thanks slowpoke)

12 years agobugfix: config-parser: bind is a synonym for bindcode
Michael Stapelberg [Mon, 8 Oct 2012 11:40:44 +0000 (13:40 +0200)]
bugfix: config-parser: bind is a synonym for bindcode

12 years agofix warning about printf() field length
Michael Stapelberg [Mon, 8 Oct 2012 11:30:14 +0000 (13:30 +0200)]
fix warning about printf() field length

12 years agoadd test.config_parser to .gitignore
Michael Stapelberg [Mon, 8 Oct 2012 11:27:42 +0000 (13:27 +0200)]
add test.config_parser to .gitignore

12 years agouse the new parser by default
Michael Stapelberg [Mon, 8 Oct 2012 11:26:42 +0000 (13:26 +0200)]
use the new parser by default

you can force the old parser with the command line flag
--force-old-config-parser-v4.4-only (which will be present in v4.4 only,
as the name suggests)

12 years agomove owindow definition into the command parser
Michael Stapelberg [Mon, 8 Oct 2012 11:26:24 +0000 (13:26 +0200)]
move owindow definition into the command parser

12 years agolink the parser test binaries with -g
Michael Stapelberg [Mon, 8 Oct 2012 11:25:57 +0000 (13:25 +0200)]
link the parser test binaries with -g

12 years agochange the commands_parser prefix to 'command' for consistency
Michael Stapelberg [Mon, 8 Oct 2012 11:25:32 +0000 (13:25 +0200)]
change the commands_parser prefix to 'command' for consistency

12 years agot/201-config-parser: test more directives, test error handling
Michael Stapelberg [Mon, 8 Oct 2012 11:24:47 +0000 (13:24 +0200)]
t/201-config-parser: test more directives, test error handling

12 years agoport the entire old config parser to the new one
Michael Stapelberg [Mon, 8 Oct 2012 11:23:48 +0000 (13:23 +0200)]
port the entire old config parser to the new one

12 years agoconfig_parser: implement <number>s, proper error handling
Michael Stapelberg [Mon, 8 Oct 2012 11:23:06 +0000 (13:23 +0200)]
config_parser: implement <number>s, proper error handling

12 years agotests: use new assign syntax, drop legacy test
Michael Stapelberg [Mon, 8 Oct 2012 11:21:48 +0000 (13:21 +0200)]
tests: use new assign syntax, drop legacy test

12 years agogenerate-command-parser: support <number>s, state ID replacing and…
Michael Stapelberg [Mon, 8 Oct 2012 11:19:33 +0000 (13:19 +0200)]
generate-command-parser: support <number>s, state ID replacing and…

…determining the next state within a function like cfg_criteria_pop() by
passing next_state in the ConfigResult (or CommandResult) and using it
after calling.

12 years agoadd first bits of a (custom) config parser
Michael Stapelberg [Sun, 7 Oct 2012 14:32:50 +0000 (16:32 +0200)]
add first bits of a (custom) config parser

12 years agogenerate-command-parser: make input/output configurable
Michael Stapelberg [Sun, 7 Oct 2012 14:30:34 +0000 (16:30 +0200)]
generate-command-parser: make input/output configurable

12 years agoi3-msg.man: fix reference to the "reply section" (Thanks slowpoke)
Michael Stapelberg [Sat, 6 Oct 2012 20:27:57 +0000 (22:27 +0200)]
i3-msg.man: fix reference to the "reply section" (Thanks slowpoke)

12 years agoallow floating cons to be reached using 'focus parent'
Michael Stapelberg [Thu, 4 Oct 2012 16:50:33 +0000 (18:50 +0200)]
allow floating cons to be reached using 'focus parent'

I suppose this was just an oversight. Let’s see if it causes any issues.

fixes #831

12 years agoImprove startup sequence termination conditions
Deiz [Thu, 4 Oct 2012 01:06:04 +0000 (21:06 -0400)]
Improve startup sequence termination conditions

If a window with _NET_STARTUP_ID set is moved to another workspace, it
will delete any associated startup sequence immediately. This will also
occur if a window has a leader with _NET_STARTUP_ID set, if the leader
has no container (never been mapped).

A startup sequence may also be deleted if it's matched by
startup_workspace_for_window() and its 30-second timeout has elapsed.

12 years agoReplace the discrete 'split' Con property with a simple function.
Deiz [Wed, 3 Oct 2012 17:10:48 +0000 (13:10 -0400)]
Replace the discrete 'split' Con property with a simple function.

12 years agoUn-fullscreen as needed when moving fullscreen containers
Deiz [Thu, 4 Oct 2012 08:22:41 +0000 (04:22 -0400)]
Un-fullscreen as needed when moving fullscreen containers

This avoids a case where a fullscreen container could be moved onto a
workspace that already had its own fullscreen container, leading to
two fullscreen containers on top of each other.

12 years agoshmlog: Remove O_TRUNC flag for shm_open, we truncate ourselves
Michael Stapelberg [Thu, 4 Oct 2012 15:05:08 +0000 (17:05 +0200)]
shmlog: Remove O_TRUNC flag for shm_open, we truncate ourselves

12 years agorelease-notes: s/mod+l/mod+e/ (Thanks hax404)
Michael Stapelberg [Thu, 4 Oct 2012 15:04:37 +0000 (17:04 +0200)]
release-notes: s/mod+l/mod+e/ (Thanks hax404)

12 years agodocs/ipc: add a warning to use an existing library (Thanks slowpoke)
Michael Stapelberg [Wed, 3 Oct 2012 21:59:33 +0000 (23:59 +0200)]
docs/ipc: add a warning to use an existing library (Thanks slowpoke)

12 years agodocs/ipc: remove unnecessary newline (Thanks Merovius)
Michael Stapelberg [Wed, 3 Oct 2012 21:54:35 +0000 (23:54 +0200)]
docs/ipc: remove unnecessary newline (Thanks Merovius)

12 years agoMerge branch 'fix-ws-layout'
Michael Stapelberg [Wed, 3 Oct 2012 13:08:31 +0000 (15:08 +0200)]
Merge branch 'fix-ws-layout'

12 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 3 Oct 2012 13:08:31 +0000 (15:08 +0200)]
Merge branch 'master' into next

12 years agoset workspace_layout in create_workspace_on_output
Sascha Kruse [Wed, 3 Oct 2012 01:52:57 +0000 (03:52 +0200)]
set workspace_layout in create_workspace_on_output

fixes #835

12 years agoFocus the relevant workspace when clicking any container.
Deiz [Sun, 30 Sep 2012 09:26:38 +0000 (05:26 -0400)]
Focus the relevant workspace when clicking any container.

12 years agoMaintain relative positioning when moving floating windows between outputs.
Deiz [Sun, 30 Sep 2012 04:30:03 +0000 (00:30 -0400)]
Maintain relative positioning when moving floating windows between outputs.

12 years agotestsuite: add 'new-test' helper script
Michael Stapelberg [Tue, 2 Oct 2012 22:13:30 +0000 (00:13 +0200)]
testsuite: add 'new-test' helper script

12 years agoadd test for previous commit
Michael Stapelberg [Tue, 2 Oct 2012 22:04:05 +0000 (00:04 +0200)]
add test for previous commit

12 years agoOnly re-focus the workspace when moving a con if the target ws is hidden.
Deiz [Mon, 1 Oct 2012 02:44:19 +0000 (22:44 -0400)]
Only re-focus the workspace when moving a con if the target ws is hidden.

12 years agoImplement moving workspaces as if they're regular containers
Deiz [Fri, 28 Sep 2012 17:54:24 +0000 (13:54 -0400)]
Implement moving workspaces as if they're regular containers

12 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 28 Sep 2012 22:03:42 +0000 (00:03 +0200)]
Merge branch 'master' into next